diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:03:30 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:03:30 -0700 |
commit | 302f5bc54448bd2b37d5a8be9b6abc29397827ef (patch) | |
tree | 3486f92b13f6b53dd28388c1f2e5f33dc9866f20 /mm/ksm.c | |
parent | 18cb657ca1bafe635f368346a1676fb04c512edf (diff) | |
parent | dd8717da6da9b0e745df49762be4573010f1013c (diff) | |
download | op-kernel-dev-302f5bc54448bd2b37d5a8be9b6abc29397827ef.zip op-kernel-dev-302f5bc54448bd2b37d5a8be9b6abc29397827ef.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: clean up timed out request handling
hpt366: fix clock turnaround
hpt366: add debounce delay to cable_detect() method
Diffstat (limited to 'mm/ksm.c')
0 files changed, 0 insertions, 0 deletions