| commit | 8e7bfcbab3825d1b404d615cb1b54f44ff81f981 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 20 13:39:00 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 20 13:39:00 2011 -0700 |
| tree | 5465eeb9c58af8dd8a26466c61de69b4b1df89dc | |
| parent | 102dc1bae12a20214c9ee2d33a7402dc5175e30d [diff] | |
| parent | 30f7276cb35a22743d709a460ae3639aad50366a [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/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