Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 19:46:32 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 19:46:32 +0000 (12:46 -0700)
commit97ddec65ff85a3226fb2856b4d93ebbcf097c28f
treef8ee80325815e05caf66a9afd09817ab1d447acd
parent9d914b3ef38d996aa6b369267fd2975e7efa92d6
parent8a226e00eeed8db843d4a580013a49ae3559bcd7
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig