Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-mips main mailing list]

Author: Ralf Baechle <ralf@...> Wed Nov 4 11:57:44 2009 +0100
Commit: 3a20db667dd960e52c7d0330122ff157e0b5f2e2
Gitweb: http://www.linux-mips.org/g/linux/3a20db66
Branch: master

---

 block/cfq-iosched.c       |   19 ++++++++++++++++---
 drivers/ata/ahci.c        |   40 +++++++++++++++++++++++++++++++++++-----
 drivers/ata/libata-core.c |    9 ++++++---
 drivers/ata/sata_via.c    |    1 -
 fs/bio.c                  |   28 ++++++++++++++--------------
 mm/backing-dev.c          |    3 ++-
 6 files changed, 73 insertions(+), 27 deletions(-)