David S. Miller 2b1c4354de Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/virtio_net.c		2009-03-20 02:27:41 -07:00
..
Kconfig	gigaset: Kconfig cleanup	2009-03-10 05:22:41 -07:00
Makefile	[PATCH] drivers/isdn/gigaset: build asyncdata.o into the gigaset module (fix)	2007-03-01 14:53:38 -08:00
asyncdata.c	gigaset: ifdef cleanup	2008-12-26 01:22:03 -08:00
bas-gigaset.c	bas_gigaset: correctly allocate USB interrupt transfer buffer	2009-03-18 23:44:23 -07:00
common.c	gigaset: use pr_err() and pr_info()	2008-12-26 01:21:29 -08:00
ev-layer.c	gigaset: ifdef cleanup	2008-12-26 01:22:03 -08:00
gigaset.h	gigaset: use pr_err() and pr_info()	2008-12-26 01:21:29 -08:00
i4l.c	gigaset: use pr_err() and pr_info()	2008-12-26 01:21:29 -08:00
interface.c	gigaset: ifdef cleanup	2008-12-26 01:22:03 -08:00
isocdata.c	gigaset: ifdef cleanup	2008-12-26 01:22:03 -08:00
proc.c	gigaset: remove pointless locking	2007-10-16 09:43:10 -07:00
ser-gigaset.c	gigaset: use pr_err() and pr_info()	2008-12-26 01:21:29 -08:00
usb-gigaset.c	gigaset: return -ENOTTY for unimplemented functions	2009-03-10 05:22:42 -07:00