aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/emergency-restart.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-19 11:01:58 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-19 11:01:58 -0400
commitab5cfd2aa3af40b35d7a948de8e279dc82c5b9f6 (patch)
tree3684691bcc62688cecd1f90f7ddcc052e2e601a5 /include/asm-i386/emergency-restart.h
parent833f73299fdf4497af1552e219e95661f4d2cdca (diff)
parentea59830db01b6b3d6bda9f84e3d272a346115e8e (diff)
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: [MTD] Use SEEK_{SET,CUR,END} instead of hardcoded values in mtdchar lseek() MTD: Fix bug in fixup_convert_atmel_pri [JFFS2][SUMMARY] Fix a summary collecting bug. [PATCH] [MTD] DEVICES: Fill more device IDs in the structure of m25p80 MTD: Add lock/unlock operations for Atmel AT49BV6416 MTD: Convert Atmel PRI information to AMD format fs/jffs2/xattr.c: remove dead code [PATCH] [MTD] Maps: Add dependency on alternate probe methods to physmap [PATCH] MTD: Add Macronix MX29F040 to JEDEC [MTD] Fixes of performance and stability issues in CFI driver. block2mtd.c: Make kernel boot command line arguments work (try 4) [MTD NAND] Fix lookup error in nand_get_flash_type() remove #error on !PCI from pmc551.c MTD: [NAND] Fix the sharpsl driver after breakage from a core conversion [MTD] NAND: OOB buffer offset fixups make fs/jffs2/nodelist.c:jffs2_obsolete_node_frag() static [PATCH] [MTD] NAND: fix dead URL in Kconfig
Diffstat (limited to 'include/asm-i386/emergency-restart.h')
0 files changed, 0 insertions, 0 deletions