summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2009-10-2937-451/+3490
|\
| * Merge commit 'gcl/merge' into mergeBenjamin Herrenschmidt2009-10-2721-371/+1196
| |\
| | * powerpc/5200: Update defconfigsGrant Likely2009-10-156-346/+569
| | * drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEMJulia Lawall2009-10-151-1/+1
| | * powerpc/boot/dts: drop obsolete 'fsl5200-clocking'Wolfram Sang2009-10-1510-17/+0
| | * of: Remove nested functionJérôme Pouiller2009-10-151-6/+7
| | * mpc5200: support for the MAN mpc5200 based board mucmc52Heiko Schocher2009-10-153-1/+334
| | * mpc5200: support for the MAN mpc5200 based board uc101Heiko Schocher2009-10-152-0/+285
| * | powerpc/ppc64: Use preempt_schedule_irq instead of preempt_scheduleBenjamin Herrenschmidt2009-10-271-20/+21
| * | powerpc: Minor cleanup to lib/Kconfig.debugKumar Gala2009-10-271-1/+1
| * | powerpc: Minor cleanup to sound/ppc/KconfigKumar Gala2009-10-271-1/+1
| * | powerpc: Minor cleanup to init/KconfigKumar Gala2009-10-271-1/+1
| * | powerpc: Limit memory hotplug support to PPC64 Book-3S machinesKumar Gala2009-10-271-1/+1
| * | powerpc: Limit hugetlbfs support to PPC64 Book-3S machinesKumar Gala2009-10-271-1/+1
| * | powerpc: Fix compile errors found by new ppc64e_defconfigKumar Gala2009-10-273-2/+3
| * | powerpc: Add a Book-3E 64-bit defconfigKumar Gala2009-10-271-0/+2199
| * | powerpc/booke: Fix xmon single step on PowerPC Book-EJosh Boyer2009-10-271-1/+19
| * | powerpc: Align vDSO base addressAndreas Schwab2009-10-271-1/+10
| * | powerpc: Fix segment mapping in vdso32Andreas Schwab2009-10-271-2/+2
| * | powerpc/iseries: Remove compiler version dependent hackStephen Rothwell2009-10-272-42/+25
| * | powerpc/perf_events: Fix priority of MSR HV vs PR bitsMichael Neuling2009-10-271-7/+10
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sam...Linus Torvalds2009-10-292-2/+3
|\ \ \
| * | | mfd: Do not dereference null pointer in twl4030 error pathIlkka Koskinen2009-10-271-1/+1
| * | | mfd: Always initialise WM831x IRQ mutexMark Brown2009-10-271-1/+2
| |/ /
* | | Merge branch 'hwpoison-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2009-10-296-35/+216
|\ \ \
| * | | HWPOISON: fix invalid page count in printk outputWu Fengguang2009-10-191-2/+5
| * | | HWPOISON: Allow schedule_on_each_cpu() from keventdAndi Kleen2009-10-191-2/+19
| * | | HWPOISON: fix/proc/meminfo alignmentHugh Dickins2009-10-191-1/+1
| * | | HWPOISON: fix oops on ksm pagesHugh Dickins2009-10-191-1/+2
| * | | HWPOISON: Fix page count leak in hwpoison late kill in do_swap_pageAndi Kleen2009-10-191-1/+2
| * | | HWPOISON: return early on non-LRU pagesWu Fengguang2009-10-191-25/+24
| * | | HWPOISON: Add brief hwpoison description to DocumentationAndi Kleen2009-10-041-0/+136
| * | | HWPOISON: Clean up PR_MCE_KILL interfaceAndi Kleen2009-10-042-5/+30
* | | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2009-10-291-1/+0
|\ \ \ \
| * | | | xfs: fix double IRELE in xfs_dqrele_inodeChristoph Hellwig2009-10-131-1/+0
* | | | | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-10-2925-61/+114
|\ \ \ \ \
| * | | | | omap4: Fix UART4 platform data on omap4Santosh Shilimkar2009-10-231-10/+0
| * | | | | omap4: Allow omap_serial_early_init() for OMAP4430 boardSantosh Shilimkar2009-10-232-2/+4
| * | | | | omap3: PM: enable UART3 module wakeupsKevin Hilman2009-10-231-3/+4
| * | | | | omap2: Fix console serial port number for n8x0Tony Lindgren2009-10-231-1/+1
| * | | | | omap2: Fix detection of n8x0Tony Lindgren2009-10-221-0/+12
| * | | | | omap1: Fix DSP public peripherals support for ams-deltaJanusz Krzysztofik2009-10-221-0/+2
| * | | | | omap1: Fix redundant UARTs pin muxing that can break other hardware supportJanusz Krzysztofik2009-10-229-26/+72
| * | | | | omap: iommu: fix wrong condition check for SUPERSECTIONHiroshi DOYU2009-10-221-1/+1
| * | | | | omap: SDMA: Fix omap_stop_dma() API for channel linkingSantosh Shilimkar2009-10-221-10/+8
| * | | | | omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards...Janusz Krzysztofik2009-10-228-8/+10
* | | | | | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6Linus Torvalds2009-10-293-7/+5
|\ \ \ \ \ \
| * | | | | | UBI: fix check on unsigned longRoel Kluin2009-10-201-1/+2
| * | | | | | UBI: fix backward compatibilityArtem Bityutskiy2009-10-202-6/+3
| |/ / / / /
* | | | | | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2009-10-294-9/+28
|\ \ \ \ \ \