summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-06-1417-51/+841
|\
| *-. Merge branches 'upstream' and 'ntrig-multitouch' into for-linusJiri Kosina2009-06-1217-51/+841
| |\ \
| | | * HID: Multitouch support for the N-Trig touchscreenStephane Chatty2009-05-201-11/+211
| | | * HID: add new multitouch and digitizer contantsStephane Chatty2009-05-202-2/+57
| | * | HID: fix inverted wheel for bluetooth version of apple mighty mouseJiri Kosina2009-06-101-4/+0
| | * | HID: no more reinitializtion is needed in post_resetJiri Kosina2009-06-041-4/+3
| | * | HID: hidraw -- fix comment about accepted devicesJiri Kosina2009-06-041-4/+1
| | * | HID: autocentering support for Logitech Force 3D ProSergey Belyashov2009-05-151-1/+7
| | * | HID: fix hid-ff drivers so that devices work even without ff supportJiri Kosina2009-05-156-24/+94
| | * | HID: force feedback support for SmartJoy PLUS PS2/USB adapterJussi Kivilinna2009-05-155-0/+198
| | * | HID: Wacom Graphire Bluetooth driverBastien Nocera2009-05-135-0/+269
| | * | HID: autocentering support for Logitech G25 Racing WheelSergey Belyashov2009-05-131-1/+1
| | |/
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-141-0/+8
|\ \ \
| * | | [ARM] 5545/2: add flush_kernel_dcache_page() for ARMNicolas Pitre2009-06-141-0/+8
* | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-14748-11557/+59708
|\ \ \ \ | |/ / / |/| | |
| * | | MAINTAINERS: EB110ATX is not ebsa110Russell King2009-06-141-1/+0
| * | | Merge branch 'u300' into develRussell King2009-06-1432-0/+6464
| |\ \ \
| | * | | [ARM] 5535/1: U300 Makefile.bootLinus Walleij2009-06-041-0/+15
| | * | | [ARM] 5533/1: Add U300 series defconfigLinus Walleij2009-06-011-0/+1115
| | * | | [ARM] make U300 clk_set_rate() return a _real_ errnoRussell King2009-05-311-1/+1
| | * | | [ARM] 5510/1: U300 GPIO debug and init fixesLinus Walleij2009-05-181-22/+24
| | * | | [ARM] 5480/1: U300-v5 integrate into the ARM architectureLinus Walleij2009-04-283-0/+31
| | * | | [ARM] 5473/1: U300 core machine supportLinus Walleij2009-04-2815-0/+1716
| | * | | [ARM] 5474/1: U300 clocking frameworkLinus Walleij2009-04-283-0/+1547
| | * | | [ARM] 5471/2: U300 GPIO and PADMUX supportLinus Walleij2009-04-284-0/+1068
| | * | | [ARM] 5470/1: U300 register definitionsLinus Walleij2009-04-285-0/+970
| * | | | Merge branch 'stmp' into develRussell King2009-06-14105-0/+11761
| |\ \ \ \
| | * | | | [ARM] 5539/1: Freescale STMP: onboard devices declarationdmitry pervushin2009-06-049-2/+771
| | * | | | [ARM] 5538/1: Freescale STMP: 378n registers definitiondmitry pervushin2009-06-0427-0/+1920
| | * | | | [ARM] 5537/1: Freescale STMP: 37nn registers definitiondmitry pervushin2009-06-0416-0/+1180
| | * | | | [ARM] 5532/1: Freescale STMP: register definitions [3/3]dmitry pervushin2009-05-3113-581/+462
| | * | | | [ARM] 5531/1: Freescale STMP: get rid of HW_zzz macros [2/3]dmitry pervushin2009-05-317-449/+393
| | * | | | [ARM] 5530/1: Freescale STMP: get rid of HW_zzz macros [1/3]dmitry pervushin2009-05-317-894/+421
| | * | | | [ARM] 5501/1: Freescale STMP: fix compilation warningdmitry pervushin2009-05-071-1/+1
| | * | | | [ARM] 5483/1: Freescale STMP: add Kconfig/Makefile entriesdmitry pervushin2009-04-272-0/+18
| | * | | | [ARM] 5463/1: Freescale STMP platform support [10/10]dmitry pervushin2009-04-272-0/+2143
| | * | | | [ARM] 5464/1: Freescale STMP platform support [7/10]dmitry pervushin2009-04-275-0/+334
| | * | | | [ARM] 5465/1: Freescale STMP platform support [7/10]dmitry pervushin2009-04-275-0/+329
| | * | | | [ARM] 5477/1: Freescale STMP platform support [6/10]dmitry pervushin2009-04-279-0/+2580
| | * | | | [ARM] 5466/1: Freescale STMP platform support [5/10]dmitry pervushin2009-04-2717-0/+951
| | * | | | [ARM] 5467/1: Freescale STMP platform support [4/10]dmitry pervushin2009-04-277-0/+1047
| | * | | | [ARM] 5468/1: Freescale STMP platform support [3/10]dmitry pervushin2009-04-277-0/+574
| | * | | | [ARM] 5469/1: Freescale STMP platform support [2/10]dmitry pervushin2009-04-273-0/+281
| | * | | | [ARM] 5461/1: Freescale STMP platform supportdmitry pervushin2009-04-273-0/+283
| | |/ / /
| * | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmia...Russell King2009-06-1473-1686/+5587
| |\ \ \ \
| | * | | | MAINTAINERS: update Eric Miao's email address and statusEric Miao2009-06-121-5/+5
| | * | | | fb: add support of LCD display controller on pxa168/910 (base layer)Lennert Buytenhek2009-06-125-0/+1499
| | * | | | [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routinesPavel Machek2009-06-113-2/+6
| | * | | | [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.Dmitry Eremin-Solenikov2009-06-111-3/+11
| | * | | | [ARM] pxa/sharpsl_pm: drop set_irq_type callsDmitry Eremin-Solenikov2009-06-111-9/+4