| author | Dan Murphy <dmurphy@ti.com> | |
| Wed, 24 Apr 2013 17:49:48 +0000 (12:49 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Wed, 24 Apr 2013 17:49:48 +0000 (12:49 -0500) | ||
| commit | 230377e448cf8312cac00b28c10d21cf08eeb16a | |
| tree | 2779b59cb338b512f3aa811efa760a9a72a478b9 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 789f38e308988141e799332d23db75c36b0095fe | commit | diff |
| parent | 96e1ede1176edef7a7f6b80278c82d31642e4169 | commit | diff |
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into connectivity-linux-3.8.y
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| arch/arm/Kconfig | diff1 | | diff2 | | blob | history |
| arch/arm/boot/dts/omap4-panda-es.dts | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/cclock54xx_data.c | diff1 | | diff2 | | blob | history |