git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b45339 6ffa01d)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Mar 2007 01:58:52 +0000 (17:58 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Mar 2007 01:58:52 +0000 (17:58 -0800)
commitbb648a0d22908116b4ef168935a160d7f17c4e6d
tree5ccb780a679433283ac7931d2bcbeb92828e443dtree
parent8b453397da923eae4aeb3b41e49793295e09eedfcommit | diff
parent6ffa01d88c9dd45e2ed917b5eeeb494d07efb1abcommit | diff
Merge branch 'upstream-linus' of /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
Unnamed repository; edit this file 'description' to name the repository.