Jaehoon Chung a39e5746e4 mmc: dw_mmc: Override blk_settings with platdata on IDMAC ... When use the IDMAC, we can also want to use the pdata->blk-setting. So if pdata->blk-setting is unset, use the default value. if not, use the pdata->blk-setting. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Will Newton <will.newton@imgtec.com> Signed-off-by: Chris Ball <cjb@laptop.org>		2012-03-25 19:33:44 -04:00
..
accessibility	…
acpi	…
amba	…
ata	ata: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
atm	eni: fix driver remove function and driver probe error path.	2012-03-16 23:13:20 -07:00
auxdisplay	…
base	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
bcma	…
block	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
bluetooth	…
cdrom	…
char	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
clk	…
clocksource	Power management updates for 3.4	2012-03-21 10:15:51 -07:00
connector	…
cpufreq	…
cpuidle	…
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-21 13:20:43 -07:00
dca	…
devfreq	PM / devfreq: add relation of recommended frequency.	2012-03-17 21:51:34 +01:00
dio	…
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
edac	edac: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
eisa	…
firewire	…
firmware	…
gpio	…
gpu	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-03-20 21:11:42 -07:00
hv	Tools: hv: Support enumeration from all the pools	2012-03-16 13:36:04 -07:00
hwmon	hwmon changes for v3.4	2012-03-21 10:37:25 -07:00
hwspinlock	…
i2c	…
ide	ide: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:17 +08:00
idle	…
ieee802154	…
infiniband	InfiniBand/RDMA changes for the 3.4 merge window. Nothing big really	2012-03-21 10:33:42 -07:00
input	driver core merge for 3.4-rc1	2012-03-20 11:16:20 -07:00
iommu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
leds	…
lguest	…
macintosh	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
mca	…
md	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
media	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
memstick	memstick: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:19 +08:00
message	…
mfd	regulator: Updates for 3.4	2012-03-21 10:34:56 -07:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-03-21 13:36:41 -07:00
mmc	mmc: dw_mmc: Override blk_settings with platdata on IDMAC	2012-03-25 19:33:44 -04:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-03-21 13:36:41 -07:00
nfc	…
nubus	…
of	Core device tree changes for Linux v3.4	2012-03-21 10:30:03 -07:00
oprofile	tidy up after d_make_root() conversion	2012-03-20 21:29:37 -04:00
parisc	…
parport	…
pci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
pcmcia	…
pinctrl	…
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
pnp	…
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
pps	…
ps3	…
ptp	phc: Update author's email address.	2012-03-17 01:41:43 -07:00
rapidio	…
regulator	regulator: Updates for 3.4	2012-03-21 10:34:56 -07:00
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-20 10:32:09 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
sbus	…
scsi	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
sfi	…
sh	…
sn	…
spi	SPI changes for v3.4.	2012-03-21 10:32:00 -07:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
staging	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
target	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
tc	…
thermal	…
tty	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
uio	…
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-03-21 13:36:41 -07:00
uwb	…
vhost	vhost: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
video	…
virt	…
virtio	…
vlynq	…
w1	…
watchdog	…
xen	…
zorro	…
Kconfig	…
Makefile	…