summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:46:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:46:29 +0100
commit2927fceafc91afe744e0d1d33f8bbf98c42668fc (patch)
treeb08de3a7caeb3e7f7844d460d0b0edad4387d968 /include/asm-generic
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
parentdrivers/ide/palm_bk3710.c buildfix (diff)
downloadlinux-2927fceafc91afe744e0d1d33f8bbf98c42668fc.tar.xz
linux-2927fceafc91afe744e0d1d33f8bbf98c42668fc.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: drivers/ide/palm_bk3710.c buildfix ide: fix Falcon IDE breakage ide: fix IDE PMAC breakage
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions