diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:52:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:52:45 +0200 |
commit | 633331f389c2d9c631371d09a54626a5e4749452 (patch) | |
tree | 6cd80edd1075635c64e612cc48e778e66795ea3a /drivers/mtd/maps/map_funcs.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [libata] revert new check-ready Status register logic (diff) | |
download | linux-633331f389c2d9c631371d09a54626a5e4749452.tar.xz linux-633331f389c2d9c631371d09a54626a5e4749452.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] revert new check-ready Status register logic
Diffstat (limited to 'drivers/mtd/maps/map_funcs.c')
0 files changed, 0 insertions, 0 deletions