Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commitbc091c93a0f60717aa99e25c406892cd8c0187dc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 20:37:22 +0000 (20 13:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 20:37:22 +0000 (20 13:37 -0700)
tree66fc7f6c97a11327c3acb0aee5c346717672a9f3
parent3ed4c0583daa34dedb568b26ff99e5a7b58db612
parenta2d063ac216c1618bfc2b4d40b7176adffa63511
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  extable, core_kernel_data(): Make sure all archs define _sdata
  core_kernel_data(): Fix architectures that do not define _sdata