Tony Lindgren a2358a7bc3 Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus ...

Conflicts:
	arch/arm/mach-omap2/pm34xx.c

2011-03-11 09:20:03 -08:00

10 KiB

Raw Blame History

View Raw