diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 22:26:30 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 22:26:30 +0100 |
commit | 683fdc5fe5fec5c4f27eb58a8781f212f50c8e01 (patch) | |
tree | fde848a374c53ff4352e0f9166b4d4eca0582886 /net/ipv4/cipso_ipv4.c | |
parent | docbook: split kernel-api for device-drivers (diff) | |
parent | PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix (diff) | |
download | linux-683fdc5fe5fec5c4f27eb58a8781f212f50c8e01.tar.xz linux-683fdc5fe5fec5c4f27eb58a8781f212f50c8e01.zip |
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/cipso_ipv4.c')
0 files changed, 0 insertions, 0 deletions