Wolfram Sang efc5863eb5 Blackfin: acvilon: fix timeout usage for I2C ... The timeout value is in jiffies, so it should be using HZ, not a plain number. As '10000' is ambiguous, 1HZ is used as conservative default. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Valentin Yakovenkov <yakovenkov@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>		2010-05-22 14:19:15 -04:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
blackfin	Blackfin: acvilon: fix timeout usage for I2C	2010-05-22 14:19:15 -04:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
frv	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
h8300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
m68knommu	m68knommu: remove a duplicate vector setting line for 68360	2010-04-21 13:43:06 +10:00
microblaze	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
score	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
sh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
sparc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
x86	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-20 09:45:38 -07:00
xtensa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
.gitignore
Kconfig	hw-breakpoints: Separate constraint space for data and instruction breakpoints	2010-05-01 04:32:11 +02:00