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)
1  2 
include/linux/pci_ids.h

Simple merge