summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stackMike Frysinger2010-01-062-2/+5
* Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-01-067-7/+28
|\
| * DaVinci: DM365: Add the device_enable for the DaVinci KeyscanMiguel Aguilar2010-01-062-6/+6
| * davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinciSekhar Nori2010-01-061-0/+1
| * davinci: da8xx/omap-l1: mark RTC as a wakeup sourceSekhar Nori2010-01-061-1/+8
| * davinci: cp_intc: provide set_wake functionSekhar Nori2010-01-061-0/+11
| * Davinci VPFE Capture: Take i2c adapter id through platform dataVaibhav Hiremath2010-01-062-0/+2
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-01-0629-214/+256
|\ \ | |/ |/|
| * ARM: 5864/1: Implement arch_reset() in NUC900Li Jie2010-01-051-1/+14
| * ARM: 5863/1: fix bugs of clock source of NUC900Li Jie2010-01-051-27/+37
| * ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_rangeBahadir Balban2010-01-051-1/+0
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2010-01-0416-81/+143
| |\
| | * imx/mx3: depend on USB_ULPI for otg_ulpi_createUwe Kleine-König2010-01-043-1/+11
| | * ARM: MX3: make CPU revision number detection work on all boardsWolfgang Denk2010-01-044-15/+5
| | * mx25: pdk: add platform code for FEC supportBaruch Siach2010-01-041-2/+44
| | * mx25: add support for FEC on i.MX25Baruch Siach2010-01-044-0/+26
| | * mx25: s/NO_PAD_CTL/NO_PAD_CTRL/Baruch Siach2010-01-041-29/+29
| | * mx31moboard: fix usbh device namesValentin Longchamp2010-01-043-3/+3
| | * mx3: add support for the mt9v022 camera sensor to pcm037 platformGuennadi Liakhovetski2010-01-041-7/+25
| | * mx27: mxt_td60: Remove not used UART pinsAlan Carvalho de Assis2010-01-041-24/+0
| * | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Russell King2010-01-0210-104/+62
| |\ \
| | * | [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMCEric Miao2009-12-291-1/+1
| | * | [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slotHaojian Zhuang2009-12-294-94/+16
| | * | [ARM] pxa/ttc_dkb: remove duplicate macro definitionUwe Kleine-König2009-12-291-2/+0
| | * | [ARM] pxa/zeus: provide power-source information when APM is enabledMarc Zyngier2009-12-291-0/+21
| | * | [ARM] pxa/zeus: relax memory timings on Zeus ethernet portsMarc Zyngier2009-12-291-1/+10
| | * | [ARM] pxa/zeus: make internal zeus_get_pcb_info staticMarc Zyngier2009-12-291-2/+2
| | * | [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310Marek Vasut2009-12-291-0/+2
| | * | [ARM] pxa/littleton: add UART3 GPIO configMarek Vasut2009-12-291-0/+6
| | * | [ARM] pxa: use resource_size() in pwm.cH Hartley Sweeten2009-12-291-4/+4
| | |/
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2010-01-052-1/+13
|\ \ \
| * | | sparc64: Fix Niagara2 perf event handling.David S. Miller2010-01-041-0/+11
| * | | sparc64: Fix NMI programming when perf events are active.David S. Miller2010-01-041-1/+2
* | | | Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-...Rusty Russell2010-01-051-1/+1
|/ / /
* | | Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linuxLinus Torvalds2010-01-048-1/+57
|\ \ \
| * \ \ ARM: Merge next-simtecBen Dooks2010-01-048-1/+57
| |\ \ \ | | |/ / | |/| |
| | * | ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata().Ben Dooks2009-12-231-1/+3
| | * | ARM: S3C24XX: touchscreen device definitionArnaud Patard2009-12-235-0/+49
| | * | ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devicesBen Dooks2009-12-231-0/+3
| | * | ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devicesBen Dooks2009-12-231-0/+2
* | | | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-01-042-37/+77
|\ \ \ \
| * | | | [S390] Update default configuration.Martin Schwidefsky2010-01-041-11/+75
| * | | | [S390] Have param.h simply include <asm-generic/param.h>.Robert P. J. Day2010-01-041-26/+2
| |/ / /
* | | | Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-01-0452-882/+3027
|\ \ \ \ | |/ / / |/| | |
| * | | sh: update defconfigs.Paul Mundt2010-01-0449-871/+3005
| * | | sh: Don't default enable PMB support.Paul Mundt2010-01-041-1/+0
| * | | sh: Disable PMB for SH4AL-DSP CPUs.Paul Mundt2010-01-041-3/+3
| * | | sh: Only provide a PCLK definition for legacy CPG CPUs.Paul Mundt2009-12-292-7/+19
| | |/ | |/|
* | | Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2009-12-311-1/+1
|\ \ \
| * | | perf: Pass appropriate frame pointer to dump_trace()Frederic Weisbecker2009-12-311-1/+1