Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Nov 2010 17:16:14 +0000 (09:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Nov 2010 17:16:14 +0000 (09:16 -0800)
commit66fc5dff5e4f82c92723202a5de9bdec16a9331f
tree4c9d2e740db2316d73c1e6bed3d6bb08cb052a73
parent9915672d41273f5b77f1b3c29b391ffb7732b84b
parente476a5a41ad67d0e2b4a652820c49a3923eb936b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
include/linux/pci_ids.h