tree f8ee80325815e05caf66a9afd09817ab1d447acd
parent 9d914b3ef38d996aa6b369267fd2975e7efa92d6
parent 8a226e00eeed8db843d4a580013a49ae3559bcd7
author Linus Torvalds <torvalds@linux-foundation.org> 1303242392 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303242392 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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