From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jan 2012 01:37:20 +0000 (-0800)
Subject: Merge branch 'unicore32' of git://github.com/gxt/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2e08e7ce5ab25a781197a71c5241742e8c9fdfe;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'unicore32' of git://github.com/gxt/linux

* 'unicore32' of git://github.com/gxt/linux:
  rtc-puv3: solve section mismatch in rtc-puv3.c
  rtc-puv3: using module_platform_driver()
  i2c-puv3: using module_platform_driver()
  rtc-puv3: irq: remove IRQF_DISABLED
  unicore32: Remove IRQF_DISABLED
  unicore32: Use set_current_blocked()
  unicore32: add ioremap_nocache definition
  unicore32: delete specified xlate_dev_mem_ptr
  of: add include asm/setup.h in drivers/of/fdt.c
  unicore32: standardize /proc/iomem "Kernel code" name
---

c2e08e7ce5ab25a781197a71c5241742e8c9fdfe