linux-toradex.git/include/linux, branch imx-android-r12 Linux kernel for Apalis and Colibri modules Merge branch 'imx_2.6.38' into imx_2.6.38_android 2011-08-05T06:19:31+00:00 Xinyu Chen b03824@freescale.com 2011-08-05T06:19:31+00:00 cd9856c350ab43dca3bec25b34e2298a212c8a29 






ENGR00154108-1 fsl_devices.h: make ldb support two ipu in separate mode
2011-08-05T03:25:32+00:00

Jason Chen
b02280@freescale.com

2011-08-04T05:18:46+00:00

1f6fc2b9c1d5311f984ba32cc6357ebf9fbc5682

make ldb support two ipu in separate mode

Signed-off-by: Jason Chen <b02280@freescale.com>





make ldb support two ipu in separate mode

Signed-off-by: Jason Chen <b02280@freescale.com>







Merge branch 'imx_2.6.38' into merge-test
2011-08-01T07:48:20+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-08-01T07:48:20+00:00

935310eb715bb901f53df3bfb18b0a9ff0ce6fe8

Conflicts:
	arch/arm/mach-mx6/board-mx6q_sabreauto.c





Conflicts:
	arch/arm/mach-mx6/board-mx6q_sabreauto.c







ENGR00153740-1 asrc: update to use new SDMA API
2011-07-27T07:05:17+00:00

Dong Aisheng
b29396@freescale.com

2011-07-27T03:27:55+00:00

6d4edb55c7c6cb8fa1a61c4baa69febdcfe133c7

Only support one pair of buffer for rx and tx per time.

Signed-off-by: Dong Aisheng <b29396@freescale.com>





Only support one pair of buffer for rx and tx per time.

Signed-off-by: Dong Aisheng <b29396@freescale.com>







fix build error
2011-07-27T03:02:57+00:00

Xinyu Chen
xinyu.chen@freescale.com

2011-07-27T03:02:57+00:00

59f0065eac34ec8fe4e3efd6e353af5644d2d89e












Remove unused codes
2011-07-27T03:02:02+00:00

Xinyu Chen
xinyu.chen@freescale.com

2011-07-27T03:02:02+00:00

cfe731612588f664038829b59e67dc69795cac9a












Android: fix android build error.
2011-07-26T08:27:13+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-07-26T08:27:13+00:00

5528884c8dd1a801bbd16b91e8c008c125387af6

Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>





Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>







Merge remote branch 'android/android-2.6.38' into imx_2.6.38
2011-07-26T05:26:08+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-07-26T05:26:08+00:00

2e4eaa38676a115a943d164eacf7e3557b77fa0f

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	include/linux/mmc/mmc.h
	kernel/power/main.c





Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	include/linux/mmc/mmc.h
	kernel/power/main.c







ENGR00139238-1 include: add p1003_ts_platform_data to fsl_device.h
2011-07-20T10:47:57+00:00

Frank Li
Frank.Li@freescale.com

2011-07-20T10:42:58+00:00

7d39c7c01754641dbb42cc186279a2f8ab0b3ce0

Add p1003_ts_platform_data to fsl_device.h

Signed-off-by: Frank Li <Frank.Li@freescale.com>





Add p1003_ts_platform_data to fsl_device.h

Signed-off-by: Frank Li <Frank.Li@freescale.com>







ENGR00153217-1 fsl_devices.h: change fsl_mxc_lcd_platform_data
2011-07-18T08:42:52+00:00

Jason Chen
b02280@freescale.com

2011-07-18T08:37:27+00:00

469e7aab1e1854c7adb68b49fc08bf03d79c501e

change fsl_mxc_lcd_platform_data.

Signed-off-by: Jason Chen <b02280@freescale.com>





change fsl_mxc_lcd_platform_data.

Signed-off-by: Jason Chen <b02280@freescale.com>