aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/tqm834x.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-10 14:46:09 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-10 14:46:09 -0700
commit9f9d76321659b5ebc9939101481f7c3ce228ea6e (patch)
tree7abd21796ad85ba6c606cd2a93e787fb90b3abe6 /drivers/mtd/maps/tqm834x.c
parent1b21f458ddbc8fb6fceeb68158e9e04b2571dabd (diff)
parentf60d89108f3481ca11672b82cf7e67171e050ce4 (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] vmlogrdr function annotation. [S390] s390: rename CPU_IDLE to S390_CPU_IDLE [S390] cio: Remove prototype for non-existing function cmf_reset(). [S390] zcrypt: fix request timeout handling [S390] system call optimization. [S390] dasd: Avoid compile warnings on !CONFIG_DASD_PROFILE [S390] Remove volatile from atomic_t [S390] Program check in diag 210 under 31 bit [S390] Bogomips calculation for 64 bit. [S390] smp: Merge smp_count_cpus() and smp_get_save_areas(). [S390] zcore: Fix __user annotation. [S390] fixed cdl-format detection. [S390] sclp: Test facility list before executing a service call. [S390] sclp: introduce some new interfaces. [S390] Fixed comment typo. [S390] vmcp cleanup
Diffstat (limited to 'drivers/mtd/maps/tqm834x.c')
0 files changed, 0 insertions, 0 deletions