diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /tools/perf/scripts/python | |
| parent | iMX51: introduce IMX_GPIO_NR (diff) | |
| parent | Linux 2.6.37-rc4 (diff) | |
| download | linux-0e44e059588e1d91f3a1974d2ce3348864d1d799.tar.gz linux-0e44e059588e1d91f3a1974d2ce3348864d1d799.zip | |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions