git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
ds.c
diff --git
a/arch/sparc/kernel/ds.c
b/arch/sparc/kernel/ds.c
index
b93c2c9
..
f09257c
100644
(file)
--- a/
arch/sparc/kernel/ds.c
+++ b/
arch/sparc/kernel/ds.c
@@
-868,7
+868,7
@@
void ldom_power_off(void)
static void ds_conn_reset(struct ds_info *dp)
{
- printk(KERN_ERR "ds-%llu: ds_conn_reset() from %p\n",
+ printk(KERN_ERR "ds-%llu: ds_conn_reset() from %p
f
\n",
dp->id, __builtin_return_address(0));
}