projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a16d38 a74ea43)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 04:01:57 +0000 (20:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 04:01:57 +0000 (20:01 -0800)
commitf7d222ea2ac7aebf1ac06a76e7739ed17480fd38
treea6de80eed5413b32cf41bcb73d108a8f11253c8etree | snapshot
parent7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2commit | diff
parenta74ea43df1afc68f265c0ac2cb64031d855ae97bcommit | diff
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
  x86: OLPC: have prom_early_alloc BUG rather than return NULL
  of/flattree: Drop an uninteresting message to pr_debug level
  of: Add missing of_address.h to xilinx ehci driver
Domain: System / Uncategorized;