summaryrefslogtreecommitdiff
path: root/drivers/ide/ide_platform.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 00:47:04 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 00:47:04 (GMT)
commit7c8d891c2c7714965db1685289787b0c526f9c42 (patch)
tree63f4bb25df1a3b9798d318e8c2c28b959709f182 /drivers/ide/ide_platform.c
parent62d00867514ae1c81ab5e809e189ca159536daee (diff)
parent54eaae3028e6b09de0bd2232a8176fc0d0a2397a (diff)
downloadlinux-fsl-qoriq-7c8d891c2c7714965db1685289787b0c526f9c42.tar.xz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] cmpxchg: implement cmpxchg64() [S390] xchg/cmpxchg: move to own header file [S390] ccwgroup_driver: remove duplicate members [S390] ccw_bus_type: make it static [S390] ccw_driver: remove duplicate members [S390] qdio: prevent handling of buffers if count is zero [S390] setup: register bss section as resource [S390] setup: simplify setup_resources() [S390] wire up sys_syncfs [S390] wire up sys_clock_adjtime [S390] wire up sys_open_by_handle_at [S390] wire up sys_name_to_handle_at [S390] oprofile: disable hw sampling for CONFIG_32BIT [S390] early: limit savesys cmd string handling [S390] early: Fix possible overlapping data buffer
Diffstat (limited to 'drivers/ide/ide_platform.c')
0 files changed, 0 insertions, 0 deletions