David S. Miller c649c0e31d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c		2009-05-25 01:42:21 -07:00
..
asyncdata.c	gigaset: remove unused structure member rcvbytes	2009-05-17 20:51:28 -07:00
bas-gigaset.c	bas_gigaset: use tasklet_hi_schedule for timing critical tasklets	2009-04-06 17:07:56 -07:00
common.c	gigaset: remove unused structure member rcvbytes	2009-05-17 20:51:28 -07:00
ev-layer.c	gigaset: remove obsolete references to m10x state table	2009-05-17 20:51:23 -07:00
gigaset.h	gigaset: remove unused structure member rcvbytes	2009-05-17 20:51:28 -07:00
i4l.c	gigaset: fix error return code	2009-05-17 20:51:25 -07:00
interface.c	gigaset: fix possible oops in error handling	2009-05-17 20:51:24 -07:00
isocdata.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-25 01:42:21 -07:00
Kconfig	gigaset: remove UNDOCREQ config option	2009-05-17 20:51:27 -07:00
Makefile
proc.c	gigaset: fix possible oops in error handling	2009-05-17 20:51:24 -07:00
ser-gigaset.c	platform: make better use of to_platform_{device,driver}() macros	2009-03-24 16:38:24 -07:00
usb-gigaset.c	gigaset: remove UNDOCREQ config option	2009-05-17 20:51:27 -07:00