]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'hsmmc' into fixes-non-critical
authorTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:15:06 +0000 (16:15 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:15:06 +0000 (16:15 -0800)
1  2 
arch/arm/mach-omap2/devices.c

Simple merge