git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be6800a
3ff195b
)
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
author
NeilBrown
<neilb@suse.de>
Fri, 21 May 2010 22:31:36 +0000
(08:31 +1000)
committer
NeilBrown
<neilb@suse.de>
Fri, 21 May 2010 22:31:36 +0000
(08:31 +1000)
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff