diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-26 22:04:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-26 22:04:46 -0800 |
| commit | c68cb23dde29fb107575656effa46f7b9440ac04 (patch) | |
| tree | 081c24059c57d8b6b4e6b6781f741878069e5edc /drivers/ata/Makefile | |
| parent | b50fd73b9d8ee1f999e8d625074872eb8fb88439 (diff) | |
| parent | a6c05c3d064dbb83be88cba3189beb5db9d2dfc3 (diff) | |
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 'drivers/ata/Makefile')
0 files changed, 0 insertions, 0 deletions