tree 5e573afb35a237a44db7a3d68a3ae5433b557481
parent 4c41042d1d4c29e596b31e2d14b26d2940fb24b4
parent f8be12d15374413cf437741a282e97129e759209
author Linus Torvalds <torvalds@linux-foundation.org> 1318795707 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1318795707 -0700

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS
  ARM: 7122/1: localtimer: add header linux/errno.h explicitly
  ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9
  ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGES