2 Commits

Author	SHA1	Message	Date
David S. Miller	bb803cfbec	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/scsi/fcoe/fcoe.c	2009-05-18 21:08:20 -07:00
Luis R. Rodriguez	203c4805e9	atheros: put atheros wireless drivers into ath/ ... Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>	2009-04-22 16:54:38 -04:00