summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf561/boards/tepla.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 01:01:19 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 01:01:19 +0100
commit9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 (patch)
treeb5492b3191f29f68018c4d76f41f8bab379db0c5 /arch/blackfin/mach-bf561/boards/tepla.c
parentMerge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentpowerpc/5200: Build fix for mpc52xx watchdog timer code (diff)
downloadlinux-9d20593a722c2dab7a5ab74f5d8c9b604aca52f9.tar.xz
linux-9d20593a722c2dab7a5ab74f5d8c9b604aca52f9.zip
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.
Diffstat (limited to 'arch/blackfin/mach-bf561/boards/tepla.c')
0 files changed, 0 insertions, 0 deletions