David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -08:00
..
aoe	aoe: remove private mac address format function	2008-11-25 00:40:37 -08:00
paride	[PATCH] switch pf	2008-10-21 07:47:59 -04:00
amiflop.c	[PATCH] switch amiflop	2008-10-21 07:47:38 -04:00
ataflop.c	[PATCH] switch ataflop	2008-10-21 07:47:42 -04:00
brd.c	[PATCH] switch brd	2008-10-21 07:47:44 -04:00
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c	cciss: fix DEBUG printk formats	2008-11-19 18:50:00 -08:00
cciss.h
cpqarray.c	cpqarry: fix return value of cpqarray_init()	2008-11-06 15:41:17 -08:00
cpqarray.h
cryptoloop.c
DAC960.c	[PATCH] switch DAC960	2008-10-21 07:47:36 -04:00
DAC960.h
floppy.c	Create/use more directory structure in the Documentation/ tree.	2008-11-14 17:28:53 +00:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig	Create/use more directory structure in the Documentation/ tree.	2008-11-14 17:28:53 +00:00
loop.c	fs: remove prepare_write/commit_write	2008-10-30 11:38:45 -07:00
Makefile
nbd.c	[PATCH] switch nbd	2008-10-21 07:47:53 -04:00
pktcdvd.c	[PATCH] sanitize blkdev_get() and friends	2008-10-21 07:49:06 -04:00
ps3disk.c
smart1,2.h
sunvdc.c
swim3.c	[PATCH] switch swim3	2008-10-21 07:48:03 -04:00
sx8.c
ub.c	ub: stub pre_reset and post_reset to fix oops	2008-11-13 14:45:04 -08:00
umem.c
umem.h
viodasd.c	[PATCH] switch viodasd	2008-10-21 07:48:07 -04:00
virtio_blk.c	[PATCH] switch virtio_blk	2008-10-21 07:48:09 -04:00
xd.c	[PATCH] switch xd	2008-10-21 07:48:11 -04:00
xd.h	[PATCH] switch xd	2008-10-21 07:48:11 -04:00
xen-blkfront.c	Release old elevator on change elevator	2008-11-18 15:08:56 +01:00
xsysace.c	xsysace: Fix driver to use resource_size_t instead of unsigned long	2008-11-14 10:21:57 -07:00
z2ram.c	[PATCH] switch z2ram	2008-10-21 07:48:17 -04:00