summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2013-05-071-0/+1
|\
| * aio: don't include aio.h in sched.hKent Overstreet2013-05-071-0/+1
* | Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2013-05-071-3/+9
|\ \ | |/ |/|
| * Merge tag 'imx-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 in...Olof Johansson2013-04-121-3/+9
| |\
| | * staging: drm/imx: Use SRC to reset IPUPhilipp Zabel2013-04-121-3/+9
| * | Merge branch 'gic/cleanup' into next/soc2Arnd Bergmann2013-04-081-1/+1
| |\ \ | | |/ | |/|
* | | staging: single_open() leaksAl Viro2013-05-058-8/+8
* | | Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2013-05-021-5/+2
|\ \ \
| * | | i2c: Ignore return value of i2c_del_adapter()Lars-Peter Clausen2013-04-021-5/+2
* | | | Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-05-024-46/+18
|\ \ \ \
| * \ \ \ Merge branch 'mxs/cleanup' into next/multiplatformArnd Bergmann2013-04-093-5/+2
| |\ \ \ \
| * | | | | staging: ste_rmi4: kill platform_data hackArnd Bergmann2013-04-084-46/+18
| | |/ / / | |/| | |
* | | | | Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-05-022-4/+1
|\ \ \ \ \
| * \ \ \ \ Merge tag 'mxs-cleanup-3.10' of git://git.linaro.org/people/shawnguo/linux-2....Arnd Bergmann2013-04-091-3/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | iio: mxs-lradc: remove unneeded mach header inclusionShawn Guo2013-04-011-3/+0
| | | |/ / | | |/| |
| * | | | Merge tag 'v3.9-rc5' into next/cleanupArnd Bergmann2013-04-092-2/+2
| |\| | | | | |_|/ | |/| |
| * | | arm: Move chained_irq_(enter|exit) to a generic fileCatalin Marinas2013-03-261-1/+1
| | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-05-0141-5702/+1600
|\ \ \
| * | | proc: Supply an accessor for getting the data from a PDE's parentDavid Howells2013-05-012-2/+2
| * | | rtl8192u: Don't need to save device proc dir PDEDavid Howells2013-05-012-13/+6
| * | | rtl8187se: Use a dir under /proc/net/r8180/David Howells2013-05-012-19/+8
| * | | proc: Add proc_mkdir_data()David Howells2013-05-011-2/+1
| * | | Include missing linux/slab.h inclusionsDavid Howells2013-04-294-1/+4
| * | | hostap: Don't use create_proc_read_entry()David Howells2013-04-293-37/+34
| * | | wlags49_h2: Don't use create_proc_read_entry()David Howells2013-04-291-159/+161
| * | | cxt1e1: Don't use create_proc_read_entry()David Howells2013-04-293-302/+175
| * | | csr: Don't use create_proc_read_entry()David Howells2013-04-293-332/+189
| * | | comedi: Don't use create_proc_read_entry()David Howells2013-04-291-21/+31
| * | | ft1000: Don't use create_proc_read_entry()David Howells2013-04-292-136/+123
| * | | rtl8187se: Don't use create_proc_read_entry()David Howells2013-04-291-71/+63
| * | | rtl8192u: Don't use create_proc_read_entry()David Howells2013-04-291-123/+91
| * | | vt6655: slightly clean reading config fileAl Viro2013-04-091-75/+40
| * | | vt6656: slightly sanitized reading configAl Viro2013-04-091-43/+20
| * | | silicom-bypass: Remove device_open/close()David Howells2013-04-091-24/+0
| * | | wlags49_h2: Don't use create_proc_entry()David Howells2013-04-091-11/+0
| * | | constify a bunch of struct file_operations instancesAl Viro2013-04-095-8/+8
| * | | procfs: new helper - PDE_DATA(inode)Al Viro2013-04-096-46/+25
| * | | rtl8192u: switch to proc_create()Al Viro2013-04-091-31/+22
| * | | keucr: switch to ->show_info()Al Viro2013-04-091-32/+13
| * | | rts5139: switch to ->show_info()Al Viro2013-04-092-23/+9
| * | | silicom: bury bp_proc.cAl Viro2013-04-093-1330/+0
| * | | silicom: switch to create_proc_data(), clean procfs side of things upAl Viro2013-04-091-820/+379
| * | | silicom: untangle module_initAl Viro2013-04-091-192/+133
| * | | silicom: get_bypass_slave_pfs() open-codes lookup_port()Al Viro2013-04-091-25/+2
| * | | silicom: unobfuscate get_{status,master}_port_fn()Al Viro2013-04-091-48/+19
| * | | silicom: helper functions are often useful...Al Viro2013-04-091-280/+43
| * | | get rid of a bunch of open-coded create_proc_read_entry()Al Viro2013-04-091-5/+2
| * | | rtl8192u: don't play with reassigning ->proc_fops, just use proc_create()Al Viro2013-04-091-5/+1
| * | | dgrp procfs fixes, part 6: just use proc_create{,_data}Al Viro2013-04-093-65/+4
| * | | dgrp procfs fixes, part 5: per-node filesAl Viro2013-04-096-129/+45