git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4739a97
156171c
)
Merge commit 'v2.6.32-rc7'
author
Eric W. Biederman
<ebiederm@xmission.com>
Tue, 17 Nov 2009 09:01:34 +0000
(
01:01
-0800)
committer
Eric W. Biederman
<ebiederm@xmission.com>
Tue, 17 Nov 2009 09:01:34 +0000
(
01:01
-0800)
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff