tree f0c31698f4f3ba47e44d34f7f5077ddde6079850
parent 73a9fe86fa21ccd528807b8cc871dc18be67ee5a
parent d945fa0da7db9ace61fbb2140cfdb1e2d2b24e7e
author Linus Torvalds <torvalds@linux-foundation.org> 1312354197 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312354197 -1000

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
  MAINTAINERS: Add keyword match for of_match_table to device tree section
  of: constify property name parameters for helper functions
  input: xilinx_ps2: Add missing of_address.h header
  of: address: use resource_size helper