Jiri Kosina fb8231a8b1 Merge branch 'master' into for-next ... Conflicts: arch/arm/mach-omap1/board-nokia770.c		2010-08-10 13:22:08 +02:00
..
boards	Fix spelling fuction -> function in comments	2010-08-09 11:22:49 +02:00
include/mach	Blackfin: TWI: clean up the MMR names	2010-08-06 12:55:55 -04:00
dma.c	Blackfin: mass clean up of copyright/licensing info	2009-10-07 04:36:26 -04:00
ints-priority.c	Blackfin: mass clean up of copyright/licensing info	2009-10-07 04:36:26 -04:00
Kconfig	Blackfin: add support for gptimer0 as a tick source	2009-06-12 06:11:37 -04:00
Makefile	Blackfin arch: fix bugs and unify BFIN_KERNEL_CLOCK option	2009-01-07 23:14:39 +08:00