Merge tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux into next/soc
authorOlof Johansson <olof@lixom.net>
Sat, 8 Dec 2012 00:29:05 +0000 (16:29 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 8 Dec 2012 00:29:05 +0000 (16:29 -0800)
commita5559a3336205eaa7c8302fcbe9da1e35f2e5a3a
tree2b6f1d7e470fcccb5f99596af8e04328d8cc733a
parent6e202df7bdb5cd6ae6a911f57b89e82161f75258
parentff33657288bf1e62078bc97b87c358f5a1f15844
Merge tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux into next/soc

From Maxime Ripard:
Fixes in sunXi related drivers for 3.8

* tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux:
  irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
  clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids