From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 20:39:00 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e7bfcbab3825d1b404d615cb1b54f44ff81f981;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] define "_sdata" symbol
  pstore: Fix Kconfig dependencies for apei->pstore
  pstore: fix potential logic issue in pstore read interface
  pstore: fix pstore filesystem mount/remount issue
  pstore: fix one type of return value in pstore
  [IA64] fix build warning in arch/ia64/oprofile/backtrace.c
---

8e7bfcbab3825d1b404d615cb1b54f44ff81f981