From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 May 2012 16:49:56 +0000 (-0700)
Subject: Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: v3.5-rc1~61
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fb8b00675eb6462aacab56bca31ed6107bda5314;p=linux.git

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

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
---

fb8b00675eb6462aacab56bca31ed6107bda5314
diff --cc arch/microblaze/Kconfig
index 83460468998d,333b85e80c07..0bf44231aaf9
--- a/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