From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2010 00:01:19 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.34-rc2~12
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=9d20593a722c2dab7a5ab74f5d8c9b604aca52f9;p=safe%2Fjmp%2Flinux-2.6

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

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/5200: Build fix for mpc52xx watchdog timer code
  of: Fix comparison of "compatible" properties
  powerpc/52xx: update defconfigs
  spi/omap2_mcspi: Use transaction speed if provided
  spi/omap2_mcspi: fix NULL pointer dereference
  uartlite: Fix build on sparc.
---

9d20593a722c2dab7a5ab74f5d8c9b604aca52f9