aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-12-061-0/+1
|\
| * ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.Marcelo Roberto Jimenez2010-12-041-0/+1
* | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar...Linus Torvalds2010-12-055-24/+8
|\ \
| * | [media] Fix Kconfig errors due to two visible menusMauro Carvalho Chehab2010-11-222-8/+5
| * | i2c/algos: convert Kconfig to use the menu's `visible' keywordArnaud Lacombe2010-11-221-1/+1
| * | media/video: convert Kconfig to use the menu's `visible' keywordArnaud Lacombe2010-11-221-1/+1
| * | Revert "i2c: Fix Kconfig dependencies"Arnaud Lacombe2010-11-222-14/+1
* | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/pa...Linus Torvalds2010-12-057-12/+25
|\ \ \
| * | | parisc: Fix GSC PS/2 driver name for keyboard and mouseGuy Martin2010-12-041-1/+1
| * | | parisc: KittyHawk LCD fixGuy Martin2010-12-041-4/+13
| * | | parisc: convert the rest of the irq handlers to simple/percpuJames Bottomley2010-12-045-7/+11
| | |/ | |/|
* | | Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabel...Linus Torvalds2010-12-032-31/+75
|\ \ \
| * | | xen: fix save/restore for PV on HVM guests with pirq remappingStefano Stabellini2010-12-021-0/+38
| * | | xen: resume the pv console for hvm guests tooStefano Stabellini2010-12-021-0/+1
| * | | xen: fix MSI setup and teardown for PV on HVM guestsStefano Stabellini2010-12-021-7/+17
| * | | xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirqStefano Stabellini2010-12-021-25/+20
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/...Linus Torvalds2010-12-032-4/+12
|\ \ \ \
| * | | | xen: allocate irq descs on any NUMA nodeJeremy Fitzhardinge2010-12-021-2/+2
| * | | | xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memoryJeremy Fitzhardinge2010-12-021-2/+10
* | | | | Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6Linus Torvalds2010-12-032-12/+29
|\ \ \ \ \
| * | | | | UBI: fix corrupted PEB detection for NOR flashArtem Bityutskiy2010-12-032-12/+29
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-12-031-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'sh/cachetlb' into sh-fixes-for-linusPaul Mundt2010-12-0139-292/+524
| |\ \ \ \ \
| * | | | | | dma: shdma: add a MODULE_ALIAS() to allow module autoloadingGuennadi Liakhovetski2010-11-251-0/+1
* | | | | | | Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2010-12-034-14/+25
|\ \ \ \ \ \ \
| * | | | | | | lxfb: Maintain video processor palette through suspend/resumeDaniel Drake2010-12-012-6/+18
| * | | | | | | video: da8xx: Register IRQ as last thing in driver probing.Caglar Akyuz2010-12-011-8/+6
| * | | | | | | framebuffer: fix fbcmap.c kernel-doc warningRandy Dunlap2010-11-261-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-12-024-10/+16
|\ \ \ \ \ \ \
| * | | | | | | HID: length resolution should be reported units/mmDmitry Torokhov2010-12-021-8/+11
| * | | | | | | HID: add support for F430 Force Feedback WheelSimon Wood2010-11-292-0/+3
| * | | | | | | HID: egalax: Use kzallocHenrik Rydberg2010-11-041-1/+1
| * | | | | | | HID: Remove KERN_DEBUG from dbg_hid useJoe Perches2010-11-031-1/+2
* | | | | | | | cs5535-gpio: apply CS5536 errata workaround for GPIOsAndres Salomon2010-12-021-2/+14
* | | | | | | | leds: fix up dependenciesJohannes Berg2010-12-022-9/+42
* | | | | | | | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-12-0226-169/+210
|\ \ \ \ \ \ \ \
| * | | | | | | | Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GNJohn Tapsell2010-11-291-0/+1
| * | | | | | | | staging: easycap needs smp_lock.h, fixes build errorRandy Dunlap2010-11-291-0/+1
| * | | | | | | | Staging: batman-adv: ensure that eth_type_trans gets linear memoryMarek Lindner2010-11-291-4/+10
| * | | | | | | | Staging: batman-adv: Don't remove interface with spinlock heldSven Eckelmann2010-11-291-6/+13
| * | | | | | | | staging: brcm80211: updated maintainers contact informationArend van Spriel2010-11-292-3/+7
| * | | | | | | | Merge branch 'master' into workGreg Kroah-Hartman2010-11-29341-2629/+5375
| |\ \ \ \ \ \ \ \
| * | | | | | | | | staging: fix winbond build, needs delay.hRandy Dunlap2010-11-191-0/+3
| * | | | | | | | | Staging: line6: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-186-130/+130
| * | | | | | | | | Staging: zram: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-2/+2
| * | | | | | | | | Staging: udlfb: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-1/+1
| * | | | | | | | | Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-1/+1
| * | | | | | | | | Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-1/+1
| * | | | | | | | | Staging: frontier: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-1/+1
| * | | | | | | | | Staging: asus_oled: fix up my fixup for some sysfs attribute permissionsGreg Kroah-Hartman2010-11-181-4/+4