aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 20:27:01 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 20:27:01 -0500
commitfb7d4045669b3ea0e92cf45963839a9808b7650c (patch)
tree4f8f2598bf27dd5ff2a096a3cb40ad83f9796c97 /include/acpi
parent100b425480d3a4c7dff4f99bead457d91ad19caf (diff)
parenta9948a7e15015e7f2cb602190322b8ebb00c54c8 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: Fix minisock tcp_create_openreq_child() typo. [TCP]: Document several sysctls. [NET]: Fix kfree(skb) [NET]: Handle disabled preemption in gfp_any() [BRIDGE]: Fix locking of set path cost. [IPV6]: /proc/net/anycast6 unbalanced inet6_dev refcnt [IPX]: Remove ancient changelog [IPX]: Remove outdated information from Kconfig [NET]: Revert socket.h/stat.h ifdef hacks. [IPV6]: anycast refcnt fix [XFRM] xfrm_user: Fix return values of xfrm_add_sa_expire.
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions