tree 740769ab145ed72af4d00ea8e4d55ebcef337fce
parent 723e9db7a46e328527cc3da2b478b831184fe828
parent a2d10568fd3965fffeb29a3a6f29966dd3801727
author Linus Torvalds <torvalds@linux-foundation.org> 1253034076 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253034076 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
  ide: fixup for fujitsu disk
  ide: convert to ->proc_fops
  at91_ide: remove headers specific for at91sam9263
  IDE: palm_bk3710: convert clock usage after clkdev conversion
  ide: fix races in handling of user-space SET XFER commands
  ide: allow ide_dev_read_id() to be called from the IRQ context
  ide: ide-taskfile.c fix style problems
  drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST
  ide-tape: fix handling of postponed rqs
  ide-tape: convert to ide_debug_log macro
  ide-tape: fix debug call
  ide: Fix annoying warning in ide_pio_bytes().
  IDE: Save a call to PageHighMem()