| commit | 800f65bba8d2030b3fef62850e203f9f176625a8 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jul 27 11:59:19 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jul 27 11:59:19 2010 -0400 |
| tree | 6507c4fe7a0826c253b4afb29375ab306a0fd9c8 | |
| parent | 06b3cda0c12986f5bba578b918b188d731c4e191 [diff] | |
| parent | b3190df628617c7a4f188a9465aeabe1f5761933 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-commands.h