From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Nov 2011 09:51:57 +0000 (-0200)
Subject: Merge branch 'unicore32' of git://github.com/gxt/linux
X-Git-Tag: firefly_0821_release~3680^2~4087
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9545eb61e5bb70055fd9358f25f95387f7398cba;p=firefly-linux-kernel-4.4.55.git

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

* 'unicore32' of git://github.com/gxt/linux:
  unicore32, exec: remove redundant set_fs(USER_DS)
  unicore32: Fix typo 'PUV3_I2C'
  unicore32: drop unused Kconfig symbols
  rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove
  arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS
  unicore32: fix build error for find bitops
---

9545eb61e5bb70055fd9358f25f95387f7398cba