From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Apr 2011 15:33:21 +0000 (-0700)
Subject: Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux... 
X-Git-Tag: firefly_0821_release~7613^2~1710
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3230ca9dc656a2354b679e2e62ee7740485563a9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'unicore32' of git://git./linux/kernel/git/epip/linux-2.6-unicore32

* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
  unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable
  unicore32 core architecture: remove duplicated #include
  unicore32 rtc driver fix: cleanup irq_set_freq and irq_set_state
  unicore32 fix: remove arch-specific futex support
  unicore32 ldscript fix: add cacheline parameter to PERCPU() macro
---

3230ca9dc656a2354b679e2e62ee7740485563a9