tree 70cce0b2f4cb82b1670e987169a7790e8467cf41
parent 28190145543260c155216b9bd3adf57bee50f8b2
parent b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097
author Linus Torvalds <torvalds@linux-foundation.org> 1326245840 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326245840 -0800

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