Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap...
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
commit52aa8c539dad56728527de664f368915ff44badf
tree4aa8615023e0bc49153e1dc160fd727f09eb4f71
parent55a4e78952286d498d89a399d845e7cfaa8ddd56
parent032a6424aeea7333a8dafc8cc05dd10b09c62680
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile