projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b48b2c3 d5c15f1)
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 16:49:56 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 16:49:56 +0000 (09:49 -0700)
Pull microblaze changes from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Setup correct pointer to TLS area
  microblaze: Add TLS support to sys_clone
  microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
  microblaze: Port OOM changes to do_page_fault
  microblaze: Do not select GENERIC_GPIO by default

1  2 
arch/microblaze/Kconfig patch | diff1 | diff2 | blob | history
arch/microblaze/kernel/entry.S patch | diff1 | diff2 | blob | history

diff --cc arch/microblaze/Kconfig
index 83460468998d5e56aee700ea5d2c219d9489b28f,333b85e80c0711636e4fc37697f81efb8ae3fcfd..0bf44231aaf91c023e2f2ac1dfa03c0a34da3a24
--- 1/arch/microblaze/Kconfig
--- 2/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -51,8 -50,14 +51,8 @@@ config GENERIC_HWEIGH
  config GENERIC_CALIBRATE_DELAY
        def_bool y
  
 -config GENERIC_TIME_VSYSCALL
 -      def_bool n
 -
 -config GENERIC_CLOCKEVENTS
 -      def_bool y
 -
  config GENERIC_GPIO
-       def_bool y
+       bool
  
  config GENERIC_CSUM
        def_bool y
diff --cc arch/microblaze/kernel/entry.S
Simple merge