]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for...
authorTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
commitc56800d350fad1e7daea22dfa717cf89268d5e09
tree8c95691ac2b5bdfc85efe417427b5903fa80450c
parentab9ae959f96560334b1010fbcd48438dc1381366
parentffc0a3d0b232b9156ed69f1bb2380aa73876e6f5
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus

Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-omap3evm.c