summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-10-211-0/+8
|\
| * powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chipsKumar Gala2010-10-141-0/+8
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-10-212-29/+82
|\ \
| * | include/linux/libata.h: fix typoAndrea Gelmini2010-10-211-1/+1
| * | libata: reorder ata_queued_cmd to remove alignment padding on 64 bit buildsRichard Kennedy2010-10-211-3/+3
| * | libata: implement cross-port EH exclusionTejun Heo2010-10-211-0/+5
| * | libata: add @ap to ata_wait_register() and introduce ata_msleep()Tejun Heo2010-10-211-2/+3
| * | libata: reimplement link power managementTejun Heo2010-10-211-6/+11
| * | libata: implement sata_link_scr_lpm() and make ata_dev_set_feature() globalTejun Heo2010-10-211-0/+2
| * | libata: clean up lpm related symbols and sysfs show/store functionsTejun Heo2010-10-211-14/+15
| * | [libata] support for > 512 byte sectors (e.g. 4K Native)Grant Grundler2010-10-211-6/+40
| * | [libata] Add ATA transport classGwendal Grignou2010-10-211-0/+5
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-10-211-0/+2
|\ \ \
| * \ \ Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2...Joel Becker2010-10-1541-84/+219
| |\ \ \
| * | | | ext3/ext4: Factor out disk addressability checkPatrick J. LoPresti2010-09-101-0/+2
* | | | | Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2010-10-213-68/+125
|\ \ \ \ \
| * | | | | memblock, bootmem: Round pfn properly for memory and reserved regionsYinghai Lu2010-10-121-13/+12
| * | | | | Merge branch 'x86/urgent' into core/memblockH. Peter Anvin2010-10-113-1/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge commit 'v2.6.36-rc7' into core/memblockIngo Molnar2010-10-0854-119/+302
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | memblock: Fix section mismatch warningsYinghai Lu2010-09-151-12/+12
| * | | | | Merge commit 'v2.6.36-rc3' into x86/memblockIngo Molnar2010-08-31498-4998/+12963
| |\ \ \ \ \
| * | | | | | x86: Remove not used early_res codeYinghai Lu2010-08-271-23/+0
| * | | | | | memblock: Add find_memory_core_early()Yinghai Lu2010-08-271-0/+2
| * | | | | | memblock: Add memblock_free/reserve_reserved_regions()Yinghai Lu2010-08-271-0/+2
| * | | | | | memblock: Add memblock_find_in_range()Yinghai Lu2010-08-051-0/+2
| * | | | | | memblock: Option for the architecture to put memblock into the .init sectionYinghai Lu2010-08-051-0/+8
| * | | | | | memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCKYinghai Lu2010-08-051-0/+3
| * | | | | | memblock: Make MEMBLOCK_ERROR be 0Benjamin Herrenschmidt2010-08-051-1/+1
| * | | | | | memblock: Export MEMBLOCK_ERRORYinghai Lu2010-08-051-1/+2
| * | | | | | memblock: Expose some memblock bits for use by x86Yinghai Lu2010-08-051-0/+5
| * | | | | | memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()Benjamin Herrenschmidt2010-08-051-1/+5
| * | | | | | memblock: NUMA allocate can now use early_pfn_mapBenjamin Herrenschmidt2010-08-051-0/+3
| * | | | | | memblock: Add arch function to control coalescing of memblock memory regionsBenjamin Herrenschmidt2010-08-051-0/+2
| * | | | | | memblock: Move memblock arrays to static storage in memblock.c and make their...Benjamin Herrenschmidt2010-08-051-3/+4
| * | | | | | memblock: Remove memblock_type.size and add memblock.memory_size insteadBenjamin Herrenschmidt2010-08-051-1/+1
| * | | | | | memblock: Remove unused memblock.debug struct memberBenjamin Herrenschmidt2010-08-051-3/+4
| * | | | | | memblock: Change u64 to phys_addr_tBenjamin Herrenschmidt2010-08-051-24/+24
| * | | | | | memblock: Remove rmo_size, burry it in arch/powerpc where it belongsBenjamin Herrenschmidt2010-08-051-1/+0
| * | | | | | memblock: Introduce default allocation limit and use it to replace explicit onesBenjamin Herrenschmidt2010-08-051-1/+15
| * | | | | | memblock: Expose MEMBLOCK_ALLOC_ANYWHEREBenjamin Herrenschmidt2010-08-051-0/+1
| * | | | | | memblock: Remove nid_range argument, arch provides memblock_nid_range() insteadBenjamin Herrenschmidt2010-08-051-2/+5
| * | | | | | memblock: Remove memblock_find()Benjamin Herrenschmidt2010-08-051-1/+0
| * | | | | | memblock: Remove obsolete accessorsBenjamin Herrenschmidt2010-08-051-23/+0
| * | | | | | memblock: Introduce for_each_memblock() and new accessorsBenjamin Herrenschmidt2010-08-041-0/+52
| * | | | | | memblock: Implement memblock_is_memory and memblock_is_region_memoryBenjamin Herrenschmidt2010-08-041-0/+2
| * | | | | | memblock: No reason to include asm/memblock.h lateBenjamin Herrenschmidt2010-08-041-2/+2
| * | | | | | memblock: Rename memblock_region to memblock_type and memblock_property to me...Benjamin Herrenschmidt2010-08-041-12/+12
* | | | | | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-214-4/+28
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'devel-stable' into develRussell King2010-10-1914-50/+53
| |\ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| *---------. \ \ \ \ \ \ \ Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 's...Russell King2010-10-1850-107/+302
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |