summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-27 07:04:46 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-27 07:04:46 +0100
commitc68cb23dde29fb107575656effa46f7b9440ac04 (patch)
tree081c24059c57d8b6b4e6b6781f741878069e5edc /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parent[IPV4]: Fix ip command line processing. (diff)
downloadlinux-c68cb23dde29fb107575656effa46f7b9440ac04.tar.xz
linux-c68cb23dde29fb107575656effa46f7b9440ac04.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Fix ip command line processing. [VETH]: move veth.h to include/linux [NET] tc_nat: header install [TUNTAP]: Fix wrong debug message. [NETFILTER]: nf_conntrack_ipv4: fix module parameter compatibility mac80211: warn when receiving frames with unaligned data mac80211: round station cleanup timer
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions