diff options
| author | Linus Torvalds | 2011-06-07 18:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-06-07 18:47:53 -0700 |
| commit | aec040e29e804b40fa2934ec7a5be9f515f23098 (patch) | |
| tree | c9afca2811091ceab7362a34fb22916fc881be10 /fs/9p | |
| parent | 8ea656bdc9d3c39e18f2bd5d8ffe0301fde64f72 (diff) | |
| parent | 6c61cfe91be53b444abc1da2dbab14efa77706c0 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix kvm defines for 31 bit compile
[S390] use generic RCU page-table freeing code
[S390] qdio: Split SBAL entry flags
[S390] kvm-s390: fix stfle facilities numbers >=64
[S390] kvm-s390: Fix host crash on misbehaving guests
Diffstat (limited to 'fs/9p')
0 files changed, 0 insertions, 0 deletions