diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:15:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:15:27 -0800 |
| commit | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch) | |
| tree | f0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 /net/ipv4/Kconfig | |
| parent | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | x86: Kconfig: drop unknown symbol 'APM_MODULE' (diff) | |
| download | linux-dev-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.tar.xz linux-dev-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.zip | |
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'
Diffstat (limited to 'net/ipv4/Kconfig')
0 files changed, 0 insertions, 0 deletions