From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Nov 2010 17:27:13 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v5.15~27441
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* '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
---

2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e