]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5e6205be0717eb7439bf9852523d7bbf71bcb542
treef8ee80325815e05caf66a9afd09817ab1d447acd
parentc8f1f2f6711f8bed7dc1b116e2de1a88fb631026
parentfc6c663130e938b52745a4f6805f8ff1982757fa
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