summaryrefslogtreecommitdiffstats
path: root/include/asm-frv/highmem.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-16 17:33:06 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-16 17:33:06 +0200
commit5206a79d7b217c139116fc6faef55d1c0e65c800 (patch)
tree334717cbd3ae9752351ec81acc088577142c8cab /include/asm-frv/highmem.h
parent[PATCH] FRV: Use the correct preemption primitives in kmap_atomic() and co (diff)
parent[Bluetooth] Use work queue to trigger URB submission (diff)
downloadlinux-5206a79d7b217c139116fc6faef55d1c0e65c800.tar.xz
linux-5206a79d7b217c139116fc6faef55d1c0e65c800.zip
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: (25 commits) [Bluetooth] Use work queue to trigger URB submission [Bluetooth] Add locking for bt_proto array manipulation [Bluetooth] Check if DLC is still attached to the TTY [Bluetooth] Fix reference count when connection lookup fails [Bluetooth] Disconnect HID interrupt channel first [Bluetooth] Support concurrent connect requests [Bluetooth] Make use of virtual devices tree [Bluetooth] Handle return values from driver core functions [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP [IPV6] sit: Add missing MODULE_LICENSE [IPV6]: Remove bogus WARN_ON in Proxy-NA handling. [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors [XFRM]: Fix xfrm_state_num going negative. [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire() NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly NetLabel: better error handling involving mls_export_cat() NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping [BRIDGE]: flush forwarding table when device carrier off [NETFILTER]: ctnetlink: Remove debugging messages [NETFILTER]: Update MAINTAINERS entry ...
Diffstat (limited to 'include/asm-frv/highmem.h')
0 files changed, 0 insertions, 0 deletions