summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* arm: mach-mvebu: use IOMEM() for base address definitionsThomas Petazzoni2012-09-212-2/+2
* arm: mach-orion5x: use IOMEM() for base address definitionsThomas Petazzoni2012-09-217-19/+24
* arm: mach-mv78xx0: use IOMEM() for base address definitionsThomas Petazzoni2012-09-216-24/+31
* arm: mach-kirkwood: use IOMEM() for base address definitionsThomas Petazzoni2012-09-217-27/+31
* arm: mach-dove: use IOMEM() for base address definitionsThomas Petazzoni2012-09-216-26/+32
* arm: mach-orion5x: use plus instead of or for address definitionsThomas Petazzoni2012-09-213-37/+37
* arm: mach-mv78xx0: use plus instead of or for address definitionsThomas Petazzoni2012-09-212-47/+47
* arm: mach-kirkwood: use plus instead of or for address definitionsThomas Petazzoni2012-09-212-65/+65
* arm: mach-dove: use plus instead of or for address definitionsThomas Petazzoni2012-09-212-67/+67
* Linux 3.6-rc5v3.6-rc5Linus Torvalds2012-09-081-1/+1
* Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux...Linus Torvalds2012-09-085-12/+120
|\
| * ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMICHiroshi Doyu2012-08-281-0/+36
| * ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages()Hiroshi Doyu2012-08-281-0/+12
| * ARM: dma-mapping: Refactor out to introduce __in_atomic_poolHiroshi Doyu2012-08-281-6/+20
| * ARM: dma-mapping: atomic_pool with struct page **pagesHiroshi Doyu2012-08-281-3/+14
| * ARM: Kirkwood: increase atomic coherent pool sizeMarek Szyprowski2012-08-281-0/+7
| * ARM: DMA-Mapping: print warning when atomic coherent allocation failsMarek Szyprowski2012-08-281-0/+4
| * ARM: DMA-Mapping: add function for setting coherent pool size from platform codeMarek Szyprowski2012-08-282-1/+25
| * ARM: relax conditions required for enabling Contiguous Memory AllocatorMarek Szyprowski2012-08-281-1/+1
| * mm: cma: fix alignment requirements for contiguous regionsMarek Szyprowski2012-08-281-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-09-084-2/+23
|\ \
| * | Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke2012-08-211-1/+5
| * | Input: i8042 - add Gigabyte T1005 series netbooks to noloop tableDmitry Torokhov2012-08-211-0/+14
| * | Input: imx_keypad - reset the hardware before enablingMichael Grzeschik2012-08-211-0/+3
| * | Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FSGuenter Roeck2012-08-211-1/+1
* | | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-09-072-2/+6
|\ \ \
| * | | HID: tpkbd: work even if the new Lenovo Keyboard driver is not configuredAndres Freund2012-09-071-1/+3
| * | | HID: Only dump input if someone is listeningHenrik Rydberg2012-09-021-1/+2
| * | | HID: add NOGET quirk for Eaton Ellipse MAX UPSAlan Stern2012-08-271-0/+1
* | | | Merge tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2012-09-064-7/+7
|\ \ \ \
| * | | | xen/pciback: Fix proper FLR steps.Konrad Rzeszutek Wilk2012-09-061-4/+4
| * | | | xen: Use correct masking in xen_swiotlb_alloc_coherent.Ronny Hegewald2012-09-051-1/+1
| * | | | xen: fix logical error in tlb flushingAlex Shi2012-09-051-1/+1
| * | | | Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus...Konrad Rzeszutek Wilk2012-09-056055-141649/+334864
| |\ \ \ \
| * | | | | xen/p2m: Fix one-off error in checking the P2M tree directory.Konrad Rzeszutek Wilk2012-09-051-1/+1
* | | | | | Merge tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/he...Linus Torvalds2012-09-066-14/+92
|\ \ \ \ \ \
| * | | | | | PCI: Don't print anything while decoding is disabledBjorn Helgaas2012-08-231-14/+17
| * | | | | | PCI/PM: Add ABI document for sysfs file d3cold_allowedHuang Ying2012-08-211-0/+12
| * | | | | | PCI/PM: Fix config reg access for D3cold and bridge suspendingHuang Ying2012-08-212-0/+51
| * | | | | | PCI/PM: Keep parent bridge active when probing deviceHuang Ying2012-08-211-0/+6
| * | | | | | PCI/PM: Enable D3/D3cold by default for most devicesHuang Ying2012-08-212-0/+6
* | | | | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-09-0617-27/+73
|\ \ \ \ \ \ \
| * | | | | | | ARM: gemini: fix the gemini buildLinus Walleij2012-09-041-0/+1
| * | | | | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/r...Olof Johansson2012-09-043-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | ARM: shmobile: armadillo800eva: enable rw rootfs mountKuninori Morimoto2012-09-031-1/+1
| | * | | | | | | ARM: shmobile: mackerel: fixup usb module orderKuninori Morimoto2012-08-311-1/+2
| | * | | | | | | ARM: shmobile: armadillo800eva: fixup: sound card detection orderKuninori Morimoto2012-08-311-1/+1
| * | | | | | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/r...Olof Johansson2012-09-021-1/+1
| |\| | | | | | |
| | * | | | | | | ARM: shmobile: marzen: fixup smsc911x id for regulatorKuninori Morimoto2012-08-301-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/lin...Olof Johansson2012-09-021-0/+1
| |\ \ \ \ \ \ \