summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2010-10-2212-795/+38
|\
| * Alchemy: Add UART PM methods.Manuel Lauss2010-10-222-35/+28
| * tty: icount changeover for other main devicesAlan Cox2010-10-221-11/+1
| * ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)Jeff Mahoney2010-10-221-87/+1
| * ioctl: Use asm-generic/ioctls.h on mn10300 (enables termiox)Jeff Mahoney2010-10-221-83/+1
| * ioctl: Use asm-generic/ioctls.h on m68k (enables termiox)Jeff Mahoney2010-10-221-79/+1
| * ioctl: Use asm-generic/ioctls.h on m32r (enables termiox)Jeff Mahoney2010-10-221-82/+1
| * ioctl: Use asm-generic/ioctls.h on ia64 (enables termiox)Jeff Mahoney2010-10-221-88/+1
| * ioctl: Use asm-generic/ioctls.h on h8300 (enables termiox)Jeff Mahoney2010-10-221-80/+1
| * ioctl: Use asm-generic/ioctls.h on frv (enables termiox)Jeff Mahoney2010-10-221-79/+1
| * ioctl: Use asm-generic/ioctls.h on cris (enables termiox)Jeff Mahoney2010-10-221-83/+1
| * ioctl: Use asm-generic/ioctls.h on avr32 (enables termiox)Jeff Mahoney2010-10-221-85/+1
| * ioctl: Use asm-generic/ioctls.h on arm (enables termiox)Jeff Mahoney2010-10-221-82/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2010-10-2231-1538/+829
|\ \
| * | m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISAThorsten Glaser2010-10-221-0/+4
| * | m68k: Remove big kernel lock in cache flush codeGeert Uytterhoeven2010-10-221-3/+0
| * | m68k: __pa(): cast arg to longAndrew Morton2010-10-221-1/+1
| * | m68k/m68knommu: merge the MMU and non-MMU traps.hGreg Ungerer2010-10-223-430/+271
| * | m68k/m68knommu: merge MMU and non-MMU thread_info.hGreg Ungerer2010-10-225-183/+111
| * | m68k/m68knommu: merge MMU and non-MMU atomic.hGreg Ungerer2010-10-223-358/+207
| * | m68k/m68knommu: clean up page.hGreg Ungerer2010-10-223-93/+55
| * | m68k/m68knommu: merge machdep.h files into a single fileGreg Ungerer2010-10-223-66/+44
| * | m68k/m68knommu: merge MMU and non-MMU string.hGreg Ungerer2010-10-223-260/+131
| * | m68k/m68knommu: Remove dead SMP config optionChristian Dietrich2010-10-225-17/+1
| * | m68k: move definition of THREAD_SIZE into thread_info_mm.hGreg Ungerer2010-10-222-6/+5
| * | m68k: Use asm-generic/ioctls.h (enables termiox)Jeff Mahoney2010-10-221-79/+1
| * | m68k: Remove dead GG2 config optionChristian Dietrich2010-10-224-47/+3
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Linus Torvalds2010-10-221-0/+14
|\ \
| * | x86, percpu: Optimize this_cpu_ptrBrian Gerst2010-09-101-0/+14
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-genericLinus Torvalds2010-10-222-0/+3
|\ \ \
| * | | bitops: make asm-generic/bitops/find.h more genericAkinobu Mita2010-10-092-0/+3
* | | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-2253-7/+64
|\ \ \ \
| * | | | llseek: automatically add .llseek fopArnd Bergmann2010-10-1552-7/+62
| * | | | spufs: use llseek in all file operationsArnd Bergmann2010-09-161-0/+18
| * | | | arm/omap: use generic_file_llseek in iommu_debugArnd Bergmann2010-09-161-0/+2
* | | | | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-2213-53/+56
|\ \ \ \ \
| * | | | | uml: kill big kernel lockArnd Bergmann2010-10-194-18/+20
| * | | | | parisc: remove big kernel lockArnd Bergmann2010-10-161-4/+0
| * | | | | cris: autoconvert trivial BKL usersArnd Bergmann2010-09-268-31/+36
| * | | | | alpha: kill big kernel lockArnd Bergmann2010-09-262-8/+0
| |/ / / /
* | | | | Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2010-10-226-37/+10
|\ \ \ \ \
| * | | | | x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZEAlexander van Heukelum2010-09-072-3/+3
| * | | | | x86-32: Align IRQ stacks properlyChristoph Hellwig2010-07-271-1/+1
| * | | | | x86: Remove CONFIG_4KSTACKSChristoph Hellwig2010-06-293-19/+1
| * | | | | x86: Always use irq stacksChristoph Hellwig2010-06-293-15/+6
* | | | | | Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-221-30/+21
|\ \ \ \ \ \
| * | | | | | x86: Hpet: Avoid the comparator readback penaltyThomas Gleixner2010-09-181-30/+21
* | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-10-21124-671/+3604
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'jwb/next' into nextBenjamin Herrenschmidt2010-10-157-4/+360
| |\ \ \ \ \ \ \
| | * | | | | | | powerpc/44x: Update ppc44x_defconfigJosh Boyer2010-10-141-4/+5