aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmciaDominik Brodowski2008-08-2350-2151/+1760
|\ \
| | * pcmcia: don't add extra DEBUG cflagDominik Brodowski2008-08-2313-19/+15
| | * pcmcia: remove unused cs_socket_name() definitionDominik Brodowski2008-08-231-2/+0
| | * pcmcia: use dev_printk in module rsrc_nonstaticDominik Brodowski2008-08-231-15/+18
| | * pcmcia: use dev_printk in module pcmciaDominik Brodowski2008-08-232-67/+81
| | * pcmcia: use dev_printk in module pcmcia_coreDominik Brodowski2008-08-233-12/+17
| | * pcmcia: use dev_printk and dev_dbg in yenta_socketDominik Brodowski2008-08-233-77/+97
| * | pcmcia: pcmcia_config_loop() improvement by passing vccDominik Brodowski2008-08-2332-142/+93
| * | pcmcia: pcmcia_config_loop() default CIS entry handlingDominik Brodowski2008-08-2332-165/+158
| * | pcmcia: pcmcia_config_loop() ConfigIndex unificationDominik Brodowski2008-08-2329-46/+6
| * | pcmcia: use pcmcia_loop_config in misc pcmcia driversDominik Brodowski2008-08-236-401/+299
| * | pcmcia: use pcmcia_loop_config in net pcmcia driversDominik Brodowski2008-08-239-654/+596
| * | pcmcia: use pcmcia_loop_config in ISDN pcmcia driversDominik Brodowski2008-08-235-319/+191
| * | pcmcia: use pcmcia_loop_config in scsi pcmcia driversDominik Brodowski2008-08-235-198/+183
| * | pcmcia: use pcmcia_loop_config in bluetooth driversDominik Brodowski2008-08-233-194/+108
| * | pcmcia: use pcmcia_loop_config in pata and ide driversDominik Brodowski2008-08-232-172/+156
| * | pcmcia: add pcmcia_loop_config() helperDominik Brodowski2008-08-233-0/+74
| |/
* | pcmcia: uniform device IDs of pata_pcmcia and ide-csDominik Brodowski2008-08-232-1/+4
* | pcmcia: only copy CIS override data onceDominik Brodowski2008-08-027-42/+23
|/
* Linux 2.6.27-rc1Linus Torvalds2008-07-281-2/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2008-07-285-142/+409
|\
| * lguest: turn Waker into a thread, not a processRusty Russell2008-07-291-63/+57
| * lguest: Enlarge virtio ringsRusty Russell2008-07-291-2/+2
| * lguest: Use GSO/IFF_VNET_HDR extensions on tun/tapRusty Russell2008-07-291-14/+20
| * lguest: Remove 'network: no dma buffer!' warningRusty Russell2008-07-291-2/+0
| * lguest: Adaptive timeoutRusty Russell2008-07-291-1/+11
| * lguest: Tell Guest net not to notify us on every packet xmitRusty Russell2008-07-291-13/+93
| * lguest: net block unneeded receive queue update notificationsRusty Russell2008-07-291-1/+13
| * lguest: wrap last_avail accesses.Rusty Russell2008-07-291-5/+11
| * lguest: use cpu capability accessorsAndrew Morton2008-07-291-2/+2
| * lguest: virtio-rng supportRusty Russell2008-07-291-0/+90
| * lguest: Support assigning a MAC addressMark McLoughlin2008-07-291-33/+89
| * lguest: Don't leak /dev/zero fdMark McLoughlin2008-07-291-0/+1
| * lguest: fix verbose printing of device features.Rusty Russell2008-07-291-2/+2
| * lguest: fix switcher_page leak on unloadJohannes Weiner2008-07-291-0/+1
| * lguest: Guest int3 fixRusty Russell2008-07-291-7/+17
| * lguest: set max_pfn_mapped, growl loudly at Yinghai LuRusty Russell2008-07-291-0/+3
* | Merge branch 'for-linus' of git://git.o-hand.com/linux-mfdLinus Torvalds2008-07-283-34/+36
|\ \
| * | mfd: accept pure device as a parent, not only platform_deviceDmitry Baryshkov2008-07-293-11/+11
| * | mfd: add platform_data to mfd_cellMike Rapoport2008-07-293-7/+12
| * | mfd: Coding style fixesBen Dooks2008-07-282-17/+15
| * | mfd: Use to_platform_device instead of container_ofBen Dooks2008-07-281-2/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2008-07-2836-568/+512
|\ \ \
| * | | x86/PCI: use dev_printk when possibleBjorn Helgaas2008-07-284-76/+64
| * | | Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linu...Jesse Barnes2008-07-2816-339/+217
| |\ \ \
| | * \ \ Merge branch 'linus' into core/generic-dma-coherentIngo Molnar2008-07-295404-194329/+339361
| | |\ \ \
| | * | | | dma-coherent: add documentation to new interfacesDmitry Baryshkov2008-07-201-0/+28
| | * | | | Cris: convert to using generic dma-coherent mem allocatorDmitry Baryshkov2008-07-203-103/+6
| | * | | | Sh: use generic per-device coherent dma allocatorDmitry Baryshkov2008-07-183-95/+5
| | * | | | ARM: support generic per-device coherent dma memDmitry Baryshkov2008-07-183-0/+11