diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-27 17:59:19 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 17:59:19 +0200 |
| commit | 800f65bba8d2030b3fef62850e203f9f176625a8 (patch) | |
| tree | 6507c4fe7a0826c253b4afb29375ab306a0fd9c8 /net/wireless/db.txt | |
| parent | rt2x00: Fix regression for rt2500pci (diff) | |
| parent | Bluetooth: Support for Atheros AR300x serial chip (diff) | |
| download | linux-800f65bba8d2030b3fef62850e203f9f176625a8.tar.xz linux-800f65bba8d2030b3fef62850e203f9f176625a8.zip | |
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
Diffstat (limited to 'net/wireless/db.txt')
0 files changed, 0 insertions, 0 deletions