summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-22 13:26:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-22 13:26:30 -0800
commit683fdc5fe5fec5c4f27eb58a8781f212f50c8e01 (patch)
treefde848a374c53ff4352e0f9166b4d4eca0582886 /net/ipv4
parentf7f84f38cd916552c175f1f3d09cb6e85c1b29fc (diff)
parent0f99fed4606dcbcbe813df831a39fd8f9653ef54 (diff)
downloadlinux-683fdc5fe5fec5c4f27eb58a8781f212f50c8e01.tar.bz2
Merge branch 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions