summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-077-173/+229
|\
| * mtd: define `mtd_is_*()' functionsBrian Norris2011-09-211-0/+12
| * mtd: kill old field for `struct mtd_info_user'Brian Norris2011-09-111-4/+1
| * mtd: nand: kill member `ops' of `struct nand_chip'Brian Norris2011-09-111-3/+0
| * mtd: document ABIBrian Norris2011-09-112-14/+74
| * mtd: add MEMWRITE ioctlBrian Norris2011-09-111-0/+11
| * mtd: rename MTD_MODE_* to MTD_FILE_MODE_*Brian Norris2011-09-111-4/+4
| * mtd: rename MTD_OOB_* to MTD_OPS_*Brian Norris2011-09-112-9/+9
| * mtd: move mtd_oob_mode_t to shared kernel/user spaceBrian Norris2011-09-112-15/+16
| * mtd: support reading OOB without ECCBrian Norris2011-09-111-0/+3
| * mtd: nand: document nand_chip.oob_poiBrian Norris2011-09-111-1/+2
| * mtd: support writing OOB without ECCBrian Norris2011-09-111-0/+3
| * mtd: style fixups in multi-line comment, indentationBrian Norris2011-09-111-7/+9
| * mtd: nand: fix spelling error (date => data)Brian Norris2011-09-111-1/+1
| * mtd: remove MEMSETOOBSEL macro definitionBrian Norris2011-09-111-1/+6
| * mtd: remove CONFIG_MTD_DEBUGBrian Norris2011-09-111-23/+0
| * mtd: plat-nand: Fixup kerneldoc for struct platform_nand_chipTobias Klauser2011-09-111-2/+0
| * mtd: spelling, capitalization, uniformityBrian Norris2011-09-112-26/+26
| * mtd: drop mtd_device_registerDmitry Eremin-Solenikov2011-09-111-3/+2
| * mtd: remove put_partition_parser() from public headerDmitry Eremin-Solenikov2011-09-111-2/+0
| * mtd: hide parse_mtd_partitionsDmitry Eremin-Solenikov2011-09-111-3/+0
| * mtd: OneNAND: Detect the correct NOP when 4KiB pagesizeKyungmin Park2011-09-111-0/+4
| * mtd: drop of_mtd_parse_partitions()Dmitry Eremin-Solenikov2011-09-111-16/+0
| * mtd: prepare to convert of_mtd_parse_partitions to partition parserDmitry Eremin-Solenikov2011-09-111-1/+4
| * mtd: abstract last MTD partition parser argumentDmitry Eremin-Solenikov2011-09-112-3/+15
| * mtd: add new API for handling MTD registrationDmitry Eremin-Solenikov2011-09-111-0/+5
| * mtd: plat-nand: drop unused fields from platform_nand_dataDmitry Eremin-Solenikov2011-09-111-2/+0
| * mtd: add a flags for partitions which should just leave smth. after themDmitry Eremin-Solenikov2011-09-111-1/+4
| * mtd: drop mtd_has_cmdlinepart()Dmitry Eremin-Solenikov2011-09-111-6/+0
| * mtd: drop physmap_configureDmitry Eremin-Solenikov2011-09-111-17/+0
| * mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCTBrian Norris2011-09-111-1/+5
| * mtd: nand: renumber the reorganized flags in nand.h / bbm.hBrian Norris2011-09-112-14/+15
| * mtd: nand: rename CREATE_EMPTY bbt flag with proper prefixBrian Norris2011-09-111-1/+1
| * mtd: nand: move NAND_CREATE_EMPTY_BBT flagBrian Norris2011-09-112-2/+7
| * mtd: nand: rename NAND_USE_FLASH_BBTBrian Norris2011-09-111-1/+1
| * mtd: nand: consolidate redundant flash-based BBT flagsBrian Norris2011-09-112-12/+9
| * mtd: nand: separate chip options / bbt_optionsBrian Norris2011-09-111-0/+4
| * mtd: nand: remove NAND_BBT_SCANBYTE1AND6 optionBrian Norris2011-09-111-2/+0
* | Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/li...Linus Torvalds2011-11-061-9/+14
|\ \
| * | jump-label: initialize jump-label subsystem much earlierJeremy Fitzhardinge2011-10-251-5/+9
| * | jump_label: add arch_jump_label_transform_static() to optimise non-live code ...Jeremy Fitzhardinge2011-10-251-0/+2
| * | jump_label: if a key has already been initialized, don't nop it outJeremy Fitzhardinge2011-10-251-2/+1
| * | jump_label: use proper atomic_t initializerJeremy Fitzhardinge2011-10-251-2/+2
* | | Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-11-062-0/+321
|\ \ \
| * | | xen/acpi: Domain0 acpi parser related platform hypercallYu Ke2011-09-262-0/+321
* | | | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0655-215/+231
|\ \ \ \
| * | | | Revert "tracing: Include module.h in define_trace.h"Paul Gortmaker2011-10-311-10/+0
| * | | | irq: don't put module.h into irq.h for tracking irqgen modules.Paul Gortmaker2011-10-312-20/+13
| * | | | bluetooth: macroize two small inlines to avoid module.hPaul Gortmaker2011-10-311-11/+13
| * | | | ip_vs.h: fix implicit use of module_get/module_put from module.hPaul Gortmaker2011-10-311-8/+7