diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:39:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:39:59 -0700 |
| commit | d7fff6f4d1ed1bc31577df887fefcb1541923367 (patch) | |
| tree | e2f37519c57efe20f47dc1df694af28d537f67b2 /drivers/acpi/Makefile | |
| parent | 6df8cd3d4f921762504c4d1e7ed702b745702543 (diff) | |
| parent | e51f802babc5e368c60fbfd08c6c11269c9253b0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Add missing entries to family name tables
[NET]: Make NETDEVICES depend on NET.
[IPV6]: endianness bug in ip6_tunnel
[IrDA]: TOSHIBA_FIR depends on virt_to_bus
[IrDA]: EP7211 IR driver port to the latest SIR API
[IrDA] Typo fix in irnetlink.c copyright
[NET]: Fix loopback crashes when multiqueue is enabled.
[IPV4]: Fix inetpeer gcc-4.2 warnings
Diffstat (limited to 'drivers/acpi/Makefile')
0 files changed, 0 insertions, 0 deletions