tree 0a84ae436325d6e646fe987516fb6bfccfff8a1c
parent 80690ccc41f01df6edfb6684006824d8edff189e
parent b3e69146f43fa351aa3cdffe2e76ec42174da612
author Tony Lindgren <tony@atomide.com> 1280927438 +0300
committer Tony Lindgren <tony@atomide.com> 1280927438 +0300

Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

Conflicts:
	arch/arm/mach-omap1/devices.c