linux-toradex.git/include/linux/mmc, branch tegra-11.2.2 Linux kernel for Apalis and Colibri modules Revert "Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"" 2011-02-14T11:11:01+00:00 Nitin Kumbhar nkumbhar@nvidia.com 2011-02-14T11:11:01+00:00 c4015fe57a590f21a9729fff9a3da23e23412f68 This reverts commit 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4. 
This reverts commit 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4.
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36 2011-02-14T08:36:01+00:00 Nitin Kumbhar nkumbhar@nvidia.com 2011-02-14T08:36:01+00:00 08f0a2e4211ab0d75862d939440f3fde0a082266 Conflicts: drivers/usb/host/ehci-tegra.c include/linux/usb.h include/linux/usb/hcd.h Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c 
Conflicts:
	drivers/usb/host/ehci-tegra.c
	include/linux/usb.h
	include/linux/usb/hcd.h

Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-02-12T22:13:29+00:00 Colin Cross ccross@android.com 2011-02-12T22:13:29+00:00 5a7997f3fb084ebf162f9481cd27bb2b1af390a5 






Merge branch 'android-2.6.36' into android-tegra-2.6.36
2011-02-12T22:13:19+00:00

Colin Cross
ccross@android.com

2011-02-12T22:13:19+00:00

87666eb18a15ffecfbd6108a9e2cb0d54e33ec99












Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
2011-02-12T21:24:26+00:00

Colin Cross
ccross@android.com

2011-02-12T21:21:32+00:00

1cd64ef5c1becb1c70c432bdcae98fdb686a8173

This reverts commit f0b0e4bec1e89014f3dcef4da8bcf95428cc771c.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Change-Id: Ib006acf9e517b3b8f7570220c28e19c91e7b5f25
Signed-off-by: Colin Cross <ccross@android.com>





This reverts commit f0b0e4bec1e89014f3dcef4da8bcf95428cc771c.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Change-Id: Ib006acf9e517b3b8f7570220c28e19c91e7b5f25
Signed-off-by: Colin Cross <ccross@android.com>







Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
2011-02-11T22:03:52+00:00

Colin Cross
ccross@android.com

2011-01-28T00:12:58+00:00

6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4

This reverts commit 2cdc235bbeb09b2b78cd02a94ab79c265861aea9.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1





This reverts commit 2cdc235bbeb09b2b78cd02a94ab79c265861aea9.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1







[misc] cancel executable permission on source files
2010-12-15T06:34:14+00:00

Chao Jiang
chaoj@nvidia.com

2010-12-06T09:12:23+00:00

60631a28826766d8c8cf4ea0920fdd6dc3acf06b

Source files should not be with executable permission.

Change-Id: I70b6be4cf88fea4be9b092ca2f5dd08e40ee7cbd
Reviewed-on: http://git-master/r/12081
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>





Source files should not be with executable permission.

Change-Id: I70b6be4cf88fea4be9b092ca2f5dd08e40ee7cbd
Reviewed-on: http://git-master/r/12081
Reviewed-by: Chao Jiang <chaoj@nvidia.com>
Tested-by: Chao Jiang <chaoj@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>







Merge branch 'android-2.6.36' into android-tegra-2.6.36
2010-10-14T23:22:55+00:00

Colin Cross
ccross@android.com

2010-10-14T23:22:55+00:00

5cb18262c713c8e2a007b81a4662cb2225b56211












mmc: Fix pm_notifier obeying deferred resume
2010-10-14T22:20:21+00:00

Dmitry Shmidt
dimitrysh@google.com

2010-10-14T22:20:21+00:00

a46384364468ab78c8a6fb2857ac935c50c6d500

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>





Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>







Merge branch 'android-2.6.36' into android-tegra-2.6.36
2010-10-08T00:35:27+00:00

Colin Cross
ccross@android.com

2010-10-08T00:35:27+00:00

ecf1cce25ccc5bf6326ae00cf0675a4ff9a9ff2d