projects / linux-flexiantxendom0-natty.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df6e61d 8948080)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 17:27:13 +0000 (09:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 17:27:13 +0000 (09:27 -0800)
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] kprobes: Fix the return address of multiple kretprobes
  [S390] kprobes: disable interrupts throughout
  [S390] ftrace: build without frame pointers on s390
  [S390] mm: add devmem_is_allowed() for STRICT_DEVMEM checking
  [S390] vmlogrdr: purge after recording is switched off
  [S390] cio: fix incorrect ccw_device_init_count
  [S390] tape: add medium state notifications
  [S390] fix get_user_pages_fast


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu Natty kernel