aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2011-06-09 04:05:26 -0500
committerNishanth Menon <nm@ti.com>2011-06-09 04:05:26 -0500
commit6b8a814d6b449730d19f90024e3eb6de09d9df0e (patch)
treee002614383eecb3d1ac9fe8dd1279cff5dda1794 /arch/arm/mach-omap1
parent1fcecf281b99f9ca262ae7fbc3703c421be5c857 (diff)
parent40f4fa047844fa9e340808b01fae1c16ef4a4e3d (diff)
parent85ec7b970553369e0c956fab1d7a6022f2a99369 (diff)
parent4f1cefe7b3cac392351b5d687ce132d7319dbdf2 (diff)
downloadkernel_samsung_tuna-6b8a814d6b449730d19f90024e3eb6de09d9df0e.zip
kernel_samsung_tuna-6b8a814d6b449730d19f90024e3eb6de09d9df0e.tar.gz
kernel_samsung_tuna-6b8a814d6b449730d19f90024e3eb6de09d9df0e.tar.bz2
Merge remote branches 'tony/for-next', 'kevin/for_3.0/pm-fixes', 'kevin/for_3.0/pm-fixes-2', 'kevin/for_3.0/gpio-fixes' and 'kevin/for_3.1/pm-misc' into omap-pm-baseline