Linus Torvalds 3668805a54 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: (21 commits) [IPSEC] flow: reorder "struct flow_cache_entry" and remove SLAB_HWCACHE_ALIGN [DECNET] ROUTE: remove unecessary alignment [IPSEC]: Add support for aes-ctr. [ISDN]: fix section mismatch warning in enpci_card_msg [TIPC]: declare proto_ops structures as 'const'. [TIPC]: Kill unused static inline (x5) [TC]: oops in em_meta [IPV6] Minor cleanup: remove unused definitions in net/ip6_fib.h [IPV6] Minor clenup: remove two unused definitions in net/ip6_route.h [AF_IUCV]: defensive programming of iucv_callback_txdone [AF_IUCV]: broken send_skb_q results in endless loop [IUCV]: wrong irq-disabling locking at module load time [CAN]: Minor clean-ups [CAN]: Move proto_{,un}register() out of spin-locked region [CAN]: Clean up module auto loading [IPSEC] flow: Remove an unnecessary ____cacheline_aligned [IPV4]: route: fix crash ip_route_input [NETFILTER]: xt_iprange: add missing #include [NETFILTER]: xt_iprange: fix typo in address family [NETFILTER]: nf_conntrack: fix ct_extend ->move operation ...		2008-02-08 09:27:06 -08:00
..
acorn/char
acpi	Merge branches 'release', 'dmi' and 'misc' into release	2008-02-08 01:22:26 -05:00
amba
ata
atm
auxdisplay
base	Driver core: Revert "Fix Firmware class name collision"	2008-02-07 11:31:46 -08:00
block	NBD: remove limit on max number of nbd devices	2008-02-08 09:22:41 -08:00
bluetooth
cdrom	Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-02-07 09:02:26 -08:00
char	Char: applicom, use pci_match_id	2008-02-08 09:22:41 -08:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware	SMBIOS/DMI: add type 41 = Onboard Devices Extended Information	2008-02-08 09:22:37 -08:00
gpio
hid
hwmon	hwmon: (lm80) Add individual alarm files	2008-02-07 20:39:45 -05:00
i2c	hwmon: Discard useless I2C driver IDs	2008-02-07 20:39:44 -05:00
ide	aout: remove unnecessary inclusions of {asm, linux}/a.out.h	2008-02-08 09:22:30 -08:00
ieee1394
infiniband
input	mn10300: add the MN10300/AM33 architecture to the kernel	2008-02-08 09:22:30 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-02-08 09:27:06 -08:00
leds	PWM LED driver	2008-02-08 09:22:38 -08:00
lguest	Fix container_of() usage	2008-02-08 09:22:32 -08:00
macintosh
mca
md	dm raid1: report fault status	2008-02-08 02:11:39 +00:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2008-02-07 12:57:44 -08:00
message
mfd
misc	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2008-02-08 09:25:58 -08:00
mmc
mtd	Merge git://git.infradead.org/mtd-2.6	2008-02-07 10:20:31 -08:00
net	mn10300: add the MN10300/AM33 architecture to the kernel	2008-02-08 09:22:30 -08:00
nubus
of
oprofile
parisc
parport	parport: fix ieee1284_epp_read_addr	2008-02-08 09:22:36 -08:00
pci	mn10300: add the MN10300/AM33 architecture to the kernel	2008-02-08 09:22:30 -08:00
pcmcia
pnp
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2008-02-07 09:45:58 -08:00
ps3
rapidio
rtc
s390
sbus
scsi	Convert SG from nopage to fault.	2008-02-07 19:09:22 -08:00
serial	fs/char_dev.c: chrdev_open marked static and removed from fs.h	2008-02-08 09:22:42 -08:00
sh
sn
spi
ssb
tc
telephony
thermal	ACPI: thermal: syntax, spelling, kernel-doc	2008-02-07 23:48:04 -05:00
uio
usb	usb: net2280 can't have a function called show_registers()	2008-02-08 09:22:30 -08:00
video	mn10300: add the MN10300/AM33 architecture to the kernel	2008-02-08 09:22:30 -08:00
virtio
w1
watchdog
xen
zorro
Kconfig
Makefile