diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 03:12:55 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 03:12:55 +0100 |
| commit | ca371d2854d48c0c22e7aa031df182f96dc85820 (patch) | |
| tree | 1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1 /drivers/misc/ibmasm/heartbeat.c | |
| parent | Merge branches 'common/clkfwk', 'common/pfc' and 'common/serial-rework' into ... (diff) | |
| parent | audit: always follow va_copy() with va_end() (diff) | |
| download | linux-ca371d2854d48c0c22e7aa031df182f96dc85820.tar.xz linux-ca371d2854d48c0c22e7aa031df182f96dc85820.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/misc/ibmasm/heartbeat.c')
| -rw-r--r-- | drivers/misc/ibmasm/heartbeat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c index 1bc4306572a4..90746378f9b7 100644 --- a/drivers/misc/ibmasm/heartbeat.c +++ b/drivers/misc/ibmasm/heartbeat.c @@ -18,7 +18,7 @@ * * Copyright (C) IBM Corporation, 2004 * - * Author: Max Asböck <amax@us.ibm.com> + * Author: Max Asböck <amax@us.ibm.com> * */ |