diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 18:04:55 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 18:04:55 +0200 |
commit | c46f87f121f815a67e84379511310e5c03862a60 (patch) | |
tree | 56c25d0ab7cd45b388810629afb52f8a983d7aa6 /kernel/notifier.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | pdc202xx_old: fix resetproc() method (diff) | |
download | linux-c46f87f121f815a67e84379511310e5c03862a60.tar.xz linux-c46f87f121f815a67e84379511310e5c03862a60.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
pdc202xx_old: fix resetproc() method
pdc202xx_old: fix 'pdc20246_dma_ops'
Diffstat (limited to 'kernel/notifier.c')
0 files changed, 0 insertions, 0 deletions