aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-07-10 02:51:26 -0400
committerNeil Brown <neilb@suse.de>2008-07-10 02:51:26 -0400
commitf9f278fefdbbbf198bb4111b3fba47d9043dae59 (patch)
tree97941f31c713ddb4a5882a81af891fc1e9cc92e3 /drivers
parent35020f1a06edade6f52fc8349e150d95cdf7fd90 (diff)
parent7a1fc53c5adb910751a9b212af90302eb4ffb527 (diff)
Merge branch 'for-2.6.26' into for-next
Conflicts: drivers/md/raid5.c
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions