]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 23 Feb 2009 18:07:09 +0000 (10:07 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 23 Feb 2009 18:07:09 +0000 (10:07 -0800)
commit1a19ce1c6a029c0ef00059129ce4b8c64a2925c6
treefbf14158c12172138f4504ca8d6b0e867aed50d6
parentaf9b42cda273c31996c548a076e884fb1082ac75
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap2/clock.c
Makefile
arch/arm/mach-omap2/clock.c
drivers/mfd/twl4030-core.c
drivers/serial/8250.c
kernel/printk.c