summaryrefslogtreecommitdiff
path: root/drivers/s390/cio/chsc_sch.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-11-03 17:45:36 -0800
committerTony Lindgren <tony@atomide.com>2014-11-03 17:45:36 -0800
commit2dde3bccbf905548a17b8d440053f86454af54a9 (patch)
treee25ebd532def85307fc231710b6660c93565d55f /drivers/s390/cio/chsc_sch.c
parent8f5951172b6dbda75a9cdf5990650e1cf8b1dd22 (diff)
parent8bf9be566ed5790003402eb1060184956788b410 (diff)
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc
Conflicts: arch/arm/mach-omap2/gpmc.c
Diffstat (limited to 'drivers/s390/cio/chsc_sch.c')
0 files changed, 0 insertions, 0 deletions