Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Sat, 10 Mar 2012 17:10:21 +0000 (09:10 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 10 Mar 2012 17:10:21 +0000 (09:10 -0800)
commit86ca5b6fef2bf1aa77a62f29d844400e4fed8dde
tree22297e3d959eebb013644fb8fe6be5fdf6819590
parente65bc8918f75620f1668d321b048bfa336ccc0fa
parentdd713e97f7e08b5742d9252f404cde34b97e1587
Merge branch 'uart' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: remove some orphan function declarations.
  ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
arch/arm/mach-omap2/pm.h