summaryrefslogtreecommitdiffstats
path: root/include/net/ipx.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-25 08:12:46 +0200
committerLen Brown <len.brown@intel.com>2010-10-25 08:12:46 +0200
commite000f8f72908e2ae924ec3900f2c0e18e76d26da (patch)
tree0573d01fc988ca669ed8f9caca634422e946b821 /include/net/ipx.h
parentMerge branches 'bugzilla-15807', 'bugzilla-15979-v2' and 'bugzilla-19162' int... (diff)
parentACPI / PM: Fix problems with acpi_pm_device_sleep_state() (diff)
downloadlinux-e000f8f72908e2ae924ec3900f2c0e18e76d26da.tar.xz
linux-e000f8f72908e2ae924ec3900f2c0e18e76d26da.zip
Merge branch 'acpi_pm_device_sleep_state' into release
Diffstat (limited to 'include/net/ipx.h')
0 files changed, 0 insertions, 0 deletions