kernel_samsung_smdk4412/drivers/mmc/card, branch replicant-6.0

smdk4412: remove some logging I added

2013-12-16T18:18:35+00:00

Change-Id: I264ee04c7c6726e68cdd186f22ab45dc8bf5be0f

d710: initial support for the Epic 4G Touch (SPH-D710)

2013-06-20T07:06:04+00:00

Change-Id: Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4

smdk4412: bulk update from i9300 update 9

2013-06-04T10:54:26+00:00

Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296

mmc: Enable support for Triangle Away

2012-11-18T21:19:09+00:00

Exposes /dev/block/mmcblk0boot0 and /dev/block/mmcblk0boot1, where
the custom binary flash count is stored.  Re-exposing these enables
the use of utilities like Triangle Away to reset the counter.

Change-Id: I4a6d4784075b4f993c7e0be4a4b7890356104ca5

merge opensource jb u5

2012-09-22T12:02:16+00:00

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2

Merge linux-3.0.31 from korg into jellybean

2012-09-18T17:02:23+00:00

Conflicts:
	arch/arm/mm/proc-v7.S
	drivers/base/core.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/r100.c
	drivers/gpu/drm/radeon/radeon_connectors.c
	drivers/gpu/drm/radeon/rs600.c
	drivers/usb/core/hub.c
	drivers/usb/host/xhci-pci.c
	drivers/usb/host/xhci.c
	drivers/usb/serial/qcserial.c
	fs/proc/base.c

Change-Id: Ia98b35db3f8c0bfd95817867d3acb85be8e5e772

samsung opensource update3

2012-07-21T21:04:45+00:00

samsung update 1

2012-06-02T11:09:29+00:00

mmc: core: check for zero length ioctl data

2012-03-01T00:33:42+00:00

commit 4d6144de8ba263eb3691a737c547e5b2fdc45287 upstream.

If the read or write buffer size associated with the command sent
through the mmc_blk_ioctl is zero, do not prepare data buffer.

This enables a ioctl(2) call to for instance send a MMC_SWITCH to set
a byte in the ext_csd.

Signed-off-by: Johan Rudholm 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: queue: bring discard_granularity/alignment into line with SCSI

2011-06-25T22:53:05+00:00

SCSI defines discard alignment as the offset to the first
optimal discard.  In the case of SD/MMC, that is always zero
which is the default.

SCSI defines discard granularity as a hint of a optimal
discard size.  That is much better expressed by the MMC
"preferred erase size" (pref_erase) field.

Signed-off-by: Adrian Hunter 
Signed-off-by: Chris Ball