| commit | bbbc4791cd48ac12996e43c0033b504c79b53639 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 21 20:37:34 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 21 20:37:34 2011 -0800 |
| tree | fb0766e5e3926db4d54765efe8081546b8d6f3aa | |
| parent | 3c688149cea2083b96e220b9884b034867373943 [diff] | |
| parent | c9fb041ff13c3b7b599fce6fb63cb903d69945d6 [diff] |
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