Merge branch 'misc_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:18:00 +0000 (10:18 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:18:00 +0000 (10:18 -0700)
1  2 
arch/arm/plat-omap/omap_device.c

Simple merge