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: unify rotary encoder bitmasks	2010-08-06 12:55:56 -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: BF51x/BF52x: support GPIO Hysteresis/Schmitt Trigger options	2010-08-06 12:55:52 -04:00
Makefile