projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb59c50 282e5aa)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
authorLinus Torvalds <[email protected]>
Sun, 8 Jan 2012 21:15:27 +0000 (13:15 -0800)
committerLinus Torvalds <[email protected]>
Sun, 8 Jan 2012 21:15:27 +0000 (13:15 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  x86: Kconfig: drop unknown symbol 'APM_MODULE'

1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
John Crispins staging tree