| commit | a492246c3439bf2ba454f566258212f7bbd310bb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 31 17:01:31 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 31 17:01:31 2012 -0700 |
| tree | 147d5423bfd63ae7178ac146b6ac9543bfad5156 | |
| parent | 155e36d40cf31c17f2b629fc2f2f5527e4cfc324 [diff] | |
| parent | 768fd0737f4533635ea351566dff98fd4912b0d8 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "A couple of s390 bug fixes for 3.5-rc4" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/32: Don't clobber personality flags on exec s390/smp: add missing smp_store_status() for !SMP s390/dasd: fix ioctl return value s390: Always use "long" for ssize_t to match size_t