| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Thu Aug 05 14:18:03 2010 -0700 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Thu Aug 05 14:18:03 2010 -0700 |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 [diff] | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a [diff] |
Staging: Merge staging-next into Linus's tree Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>