aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-02 20:58:52 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-02 20:58:52 -0500
commitbb648a0d22908116b4ef168935a160d7f17c4e6d (patch)
tree5ccb780a679433283ac7931d2bcbeb92828e443d /include/asm-i386
parent8b453397da923eae4aeb3b41e49793295e09eedf (diff)
parent6ffa01d88c9dd45e2ed917b5eeeb494d07efb1ab (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: add CONFIG_PM to libata core layer libata: add missing CONFIG_PM in LLDs libata: add missing PM callbacks pata_qdi: Fix initialisation [libata] pata_cmd64x: fix driver description in comments [libata] pata_{legacy,sc1200,sl82c105}: add missing hooks [libata] change master/slave IDENTIFY order libata-core: Fix simplex handling
Diffstat (limited to 'include/asm-i386')
0 files changed, 0 insertions, 0 deletions