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)
* '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.

1  2 
arch/arm/mach-omap2/pm.h

Simple merge