]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 04:37:34 +0000 (20:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 04:37:34 +0000 (20:37 -0800)
commitfc8e09fd6087f5d537130843501fc72b8f6dd8d6
treefb0766e5e3926db4d54765efe8081546b8d6f3aa
parent948bf8b629e60f4fcc7c2dec402919dcae5076a0
parent7375c4039f30e24391a3f29ad5086cf6ad9804bb
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: fix more ET131X build errors
  staging: et131x depends on NET
  staging: slicoss depends on NET
  linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled