diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 20:01:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 20:01:19 -0400 |
| commit | 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 (patch) | |
| tree | b5492b3191f29f68018c4d76f41f8bab379db0c5 /arch/blackfin/include/asm/ftrace.h | |
| parent | 9b59a0a4eefa132a3899b6e8d362f92559c67844 (diff) | |
| parent | 9205124c66a69664c6825501cb062ebd2acd3b3a (diff) | |
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/include/asm/ftrace.h')
0 files changed, 0 insertions, 0 deletions