summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epi...Linus Torvalds2011-03-17163-17/+19408
|\
| * unicore32: rewrite arch-specific tlb.h to use asm-generic versionGuanXuetao2011-03-171-82/+12
| * unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEsGuanXuetao2011-03-1726-362/+365
| * unicore32: replace unicore32-specific iomap functions with generic lib implem...GuanXuetao2011-03-174-60/+10
| * unicore32 machine related: add frame buffer driver for pkunity-v3 socGuanXuetao2011-03-178-2/+879
| * unicore32 machine related files: add i2c bus drivers for pkunity-v3 socGuanXuetao2011-03-175-0/+323
| * unicore32 io: redefine __REG(x) and re-use readl/writel funcsGuanXuetao2011-03-1713-164/+171
| * unicore32 i8042 upgrade and bugfix: adjust resource request region typeGuanXuetao2011-03-171-2/+2
| * unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map callGuanXuetao2011-03-171-1/+1
| * unicore32 i8042: adjust io funcs of i8042-unicore32io.hGuanXuetao2011-03-171-9/+12
| * unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASEGuanXuetao2011-03-172-3/+3
| * unicore32: modify function names and parameters for irq_chipsGuanXuetao2011-03-172-41/+42
| * unicore32: remove unused lines in arch/unicore32/include/asm/irq.hGuanXuetao2011-03-171-2/+0
| * unicore32 time.c: change calculate method for clock_event_deviceGuanXuetao2011-03-171-7/+2
| * unicore32: ADD MAINTAINER for unicore32 architectureGuanXuetao2011-03-171-0/+14
| * unicore32 machine related files: ps2 driverGuanXuetao2011-03-172-0/+72
| * unicore32 machine related files: pci bus handlingGuanXuetao2011-03-173-0/+451
| * unicore32 machine related files: hardware registersGuanXuetao2011-03-1720-0/+1615
| * unicore32 machine related files: core filesGuanXuetao2011-03-173-0/+440
| * unicore32 additional architecture files: boot processGuanXuetao2011-03-177-0/+546
| * unicore32 additional architecture files: low-level lib: miscGuanXuetao2011-03-1710-0/+662
| * unicore32 additional architecture files: low-level lib: uaccessGuanXuetao2011-03-178-0/+648
| * unicore32 additional architecture files: low-level lib: ocd debugGuanXuetao2011-03-174-0/+269
| * unicore32 additional architecture files: ptrace handlingGuanXuetao2011-03-172-0/+282
| * unicore32 additional architecture files: float point handlingGuanXuetao2011-03-173-0/+205
| * unicore32 additional architecture files: pm related filesGuanXuetao2011-03-178-0/+1156
| * unicore32 core architecture: signals handlingGuanXuetao2011-03-172-0/+523
| * unicore32 core architecture: interrupts ang gpio handlingGuanXuetao2011-03-175-0/+811
| * unicore32 core architecture: timer and time handlingGuanXuetao2011-03-174-0/+825
| * unicore32 core architecture: mm related: consistent device DMA handlingGuanXuetao2011-03-1710-0/+1207
| * unicore32 core architecture: mm related: fault handlingGuanXuetao2011-03-1710-0/+2247
| * unicore32 core architecture: mm related: generic codesGuanXuetao2011-03-1713-0/+1390
| * unicore32 core architecture: process/thread related codesGuanXuetao2011-03-176-0/+912
| * unicore32 core architecture: low level entry and setup codesGuanXuetao2011-03-176-0/+1820
| * unicore32 core architecture: processor and system headersGuanXuetao2011-03-1710-0/+810
| * unicore32 core architecture: generic elf and ksyms stuffGuanXuetao2011-03-178-0/+571
| * unicore32 core architecture: build infrastructureGuanXuetao2011-03-179-0/+758
| * asm-generic headers: add arch-specific __strnlen_user calling in uaccess.hGuanXuetao2011-03-171-3/+5
| * asm-generic headers: add ftrace.hGuanXuetao2011-03-171-0/+16
| * asm-generic headers: add sizes.hGuanXuetao2011-03-171-0/+47
| * asm-generic: fix inX/outX functions for architectures that have PCIGuanXuetao2011-03-171-14/+19
* | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2011-03-1719-178/+248
|\ \
| * | [S390] kexec: Disable ftrace during kexecHeiko Carstens2011-03-151-0/+2
| * | [S390] support XZ compressed kernelHeiko Carstens2011-03-153-1/+11
| * | [S390] css_bus_type: make it staticSebastian Ott2011-03-152-8/+2
| * | [S390] css_driver: remove duplicate membersSebastian Ott2011-03-154-10/+8
| * | [S390] css: remove subchannel privateSebastian Ott2011-03-151-1/+0
| * | [S390] css: move chsc_private to drv_dataSebastian Ott2011-03-151-5/+6
| * | [S390] css: move io_private to drv_dataSebastian Ott2011-03-152-7/+14
| * | [S390] cio: move cdev pointer to io_subchannel_privateSebastian Ott2011-03-151-2/+15