| commit | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 08 13:15:27 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 08 13:15:27 2012 -0800 |
| tree | f0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 | |
| parent | eb59c505f8a5906ad2e053d14fab50eb8574fd6f [diff] | |
| parent | 282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: x86: Kconfig: drop unknown symbol 'APM_MODULE'