David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/bluetooth/l2cap_core.c		2011-07-14 07:56:40 -07:00
..
card	mmc: queue: bring discard_granularity/alignment into line with SCSI	2011-06-25 18:53:05 -04:00
core	mmc: core: Bus width testing needs to handle suspend/resume	2011-07-13 14:54:37 -04:00
host	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-14 07:56:40 -07:00
Kconfig
Makefile