Merge branch 'for_3.6/fixes/ads7846-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Tue, 7 Aug 2012 10:57:03 +0000 (03:57 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Aug 2012 10:57:03 +0000 (03:57 -0700)
commit8aeff82fabe818bbd755c74ce829ea5a4d89b5c0
tree8a4325a6c632cafbcb38c537ba8cfe86443271f8
parentae377aaf98630de03e58fffdf3f35dec3d0ca5e0
parentc31cc1b764b6efb713601d351c1a879c042eab34
Merge branch 'for_3.6/fixes/ads7846-2' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes