Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:49:57 +0000 (20:49 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:49:57 +0000 (20:49 -1000)
commita6b11f53388973d99c4a357c22b19753b424e73c
treef0c31698f4f3ba47e44d34f7f5077ddde6079850
parent73a9fe86fa21ccd528807b8cc871dc18be67ee5a
parentd945fa0da7db9ace61fbb2140cfdb1e2d2b24e7e
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