]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:33:21 +0000 (08:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:33:21 +0000 (08:33 -0700)
commit3230ca9dc656a2354b679e2e62ee7740485563a9
treeb5659a952454efe7ef18e6f34bf123e948ae413e
parent7dbb25a579fe1f068358a19928ada4f9be62e60d
parent6b794743b2c5e21825d35b5d5dd57d6fcc388198
Merge branch 'unicore32' of git://git.kernel.org/pub/scm/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