aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAge
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epi...Linus Torvalds2011-03-17
|\
| * unicore32 machine related: add frame buffer driver for pkunity-v3 socGuanXuetao2011-03-16
| * unicore32 machine related files: add i2c bus drivers for pkunity-v3 socGuanXuetao2011-03-16
| * unicore32 io: redefine __REG(x) and re-use readl/writel funcsGuanXuetao2011-03-16
| * unicore32 i8042 upgrade and bugfix: adjust resource request region typeGuanXuetao2011-03-16
| * unicore32 i8042: adjust io funcs of i8042-unicore32io.hGuanXuetao2011-03-16
| * unicore32 machine related files: ps2 driverGuanXuetao2011-03-16
| * unicore32 machine related files: pci bus handlingGuanXuetao2011-03-16
* | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2011-03-17
|\ \
| * | [S390] css_bus_type: make it staticSebastian Ott2011-03-15
| * | [S390] css_driver: remove duplicate membersSebastian Ott2011-03-15
| * | [S390] css: remove subchannel privateSebastian Ott2011-03-15
| * | [S390] css: move chsc_private to drv_dataSebastian Ott2011-03-15
| * | [S390] css: move io_private to drv_dataSebastian Ott2011-03-15
| * | [S390] cio: move cdev pointer to io_subchannel_privateSebastian Ott2011-03-15
| * | [S390] cio: move options to io_sch_privateSebastian Ott2011-03-15
| * | [S390] cio: move asms to generic headerSebastian Ott2011-03-15
| * | [S390] cio: move orb definitions to separate headerSebastian Ott2011-03-15
| * | [S390] dasd: get rid of compile warningHeiko Carstens2011-03-15
| * | [S390] remove superfluous check from do_IRQSebastian Ott2011-03-15
| |/
* | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let...Linus Torvalds2011-03-17
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2011-03-17
| |\ \
| * | | serial: sh-sci: fix deadlock when resuming from S3 sleepAlexandre Courbot2011-03-04
| * | | Merge branch 'sh/st-integration' into sh-latestPaul Mundt2011-02-15
| |\ \ \
| * \ \ \ Merge branch 'sh/urgent' into sh-latestPaul Mundt2011-02-01
| |\ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' in...Paul Mundt2011-01-26
| |\ \ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2011-01-26
| | | |\ \ \ \ \
| | | * | | | | | serial: sh-sci: Kill off the special earlyprintk device.Paul Mundt2011-01-21
| | | * | | | | | serial: sh-sci: Use dev_name() for region reservations.Paul Mundt2011-01-21
| | | * | | | | | serial: sh-sci: Fix up earlyprintk port mapping.Paul Mundt2011-01-21
| | | * | | | | | serial: sh-sci: Limit early console to one device.Paul Mundt2011-01-20
| | | * | | | | | serial: sh-sci: Fix up break timer scheduling race.Paul Mundt2011-01-20
| | | * | | | | | serial: sh-sci: Bring oversized error handlers out of line.Paul Mundt2011-01-20
| | | * | | | | | serial: sh-sci: Handle port memory region reservations.Paul Mundt2011-01-20
| | | * | | | | | serial: sh-sci: Fix up ioremap handling.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Kill off unused SCSCR definitions.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Handle request_irq() failures.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Require a device per port mapping.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Kill off some DMA ifdeffery.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Consolidate port definition structures.Paul Mundt2011-01-19
| | | * | | | | | serial: sh-sci: Kill off unused membase kludge.Paul Mundt2011-01-19
| * | | | | | | | watchdog: shwdt: driver model conversion.Paul Mundt2010-05-25
| * | | | | | | | watchdog: shwdt: Kill off mmap stub and superfluous comments.Paul Mundt2010-05-25
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6Linus Torvalds2011-03-17
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6Paul Mundt2011-03-16
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'viafb-pll' into viafb-nextFlorian Tobias Schandinat2011-03-12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | viafb: split pll configs upFlorian Tobias Schandinat2011-03-12
| | | * | | | | | | | | viafb: remove duplicated clock storageFlorian Tobias Schandinat2011-03-12
| | | * | | | | | | | | viafb: always return the best possible clockFlorian Tobias Schandinat2011-03-12
| | | * | | | | | | | | viafb: remove duplicated clock informationFlorian Tobias Schandinat2011-03-12