aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-02 08:27:00 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-02 08:27:00 +1100
commit45f37e86f1ef95f002386d8a0ab508407cec9bf3 (patch)
treeaeae54129b9a440b2d1d80a80d84070a91e83c9c /drivers/ide/ide.c
parent[MIPS] Split the micro-assembler from tlbex.c. (diff)
parentlatencytop: Change Kconfig dependency. (diff)
downloadlinux-dev-45f37e86f1ef95f002386d8a0ab508407cec9bf3.tar.xz
linux-dev-45f37e86f1ef95f002386d8a0ab508407cec9bf3.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: latencytop: Change Kconfig dependency. futex: Add bitset conditional wait/wakeup functionality futex: Remove warn on in return fixup path x86: replace LOCK_PREFIX in futex.h tick-sched: add more debug information timekeeping: update xtime_cache when time(zone) changes hrtimer: fix hrtimer_init_sleeper() users
Diffstat (limited to 'drivers/ide/ide.c')
0 files changed, 0 insertions, 0 deletions