Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Dec 2013 18:49:44 +0000 (10:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Dec 2013 18:49:44 +0000 (10:49 -0800)
commita3981a52a2d0d5a14273d8593b586375be33b124
tree3714233efff656def7bfa695b60e397e28c5b99b
parent413541dd66d51f791a0b169d9b9014e4f56be13c
parent7122c3e9154b5d9a7422f68f02d8acf050fad2b0
Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/rusty/linux

Pull virtio balloon driver fixes from Rusty Russell:
 "Refactoring broke the balloon driver, and fixing kallsyms on ARM broke
  some (non-ARM) MMUless setups, so we're making that fix ARM-only for
  now.

  Unfortunately, the ARM refactoring which broke kallsyms/perf was
  CC:stable, so the fix (which broken non-ARM) was also CC:stable, so
  now the partial reversion is also CC:stable..."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  scripts/link-vmlinux.sh: only filter kernel symbols for arm
  virtio_balloon: update_balloon_size(): update correct field