projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b50fd73
a6c05c3
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:46 +0000
(22:04 -0800)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:46 +0000
(22:04 -0800)
* 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
Trivial merge