tree 5bb7d5913427c245c61dd5eb384321dff386f841
parent 0dcd627896fb87b2e78a1ed78e469591208cffcd
parent da911782be4c82dc1222aa0cb5bef28605d1e117
author Arnd Bergmann <arnd@arndb.de> 1329112207 +0000
committer Arnd Bergmann <arnd@arndb.de> 1329112226 +0000

Merge branch 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (2 commits)
  ARM: EXYNOS: Add cpu-offset property in gic device tree node
  ARM: EXYNOS: Bring exynos4-dt up to date
  Linux 3.3-rc3

This includes an update to the v3.3-rc3 release from v3.3-rc2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>