aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/jmicron.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-02 13:32:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-02 13:32:26 -0800
commitae29a18594c40a344ddd5bcd6abe575786a5d978 (patch)
tree07e4e7e49ca0a891735e9da20929ddf61606c7ba /drivers/ide/jmicron.c
parent0bf82cccd1e17135f880c161bc7926f5b25df34c (diff)
parent52ebb438e952c674e5a5c131292589db9bcf169b (diff)
downloadkernel_samsung_smdk4412-ae29a18594c40a344ddd5bcd6abe575786a5d978.zip
kernel_samsung_smdk4412-ae29a18594c40a344ddd5bcd6abe575786a5d978.tar.gz
kernel_samsung_smdk4412-ae29a18594c40a344ddd5bcd6abe575786a5d978.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide-gd: re-get capacity on revalidate tx4938ide: Avoid underflow on calculation of a wait cycle tx4938ide: Do not call devm_ioremap for whole 128KB tx4938ide: Check minimum cycle time and SHWT range (v2) ide: Switch to a common address ide-cd: fix DMA alignment regression
Diffstat (limited to 'drivers/ide/jmicron.c')
-rw-r--r--drivers/ide/jmicron.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index 9a68433..bf2be64 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2006 Red Hat <alan@redhat.com>
+ * Copyright (C) 2006 Red Hat
*
* May be copied or modified under the terms of the GNU General Public License
*/