diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:31 -0800 |
| commit | f8c7e6c2038a96f427911264a0c1448c9e3c2a9e (patch) | |
| tree | 2013405da9810dc4d9a5e77497f1afadb5b8d5d3 /drivers/staging/et131x/et1310_address_map.h | |
| parent | c9140487b4601ea0b4479af3d92ceb0cda2c691f (diff) | |
| parent | bd796671f093d5b1841d383674d5650f5ec6c9c6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Revert "sysdev: fix prototype for memory_sysdev_class show/store functions"
driver-core: fix devtmpfs crash on s390
Diffstat (limited to 'drivers/staging/et131x/et1310_address_map.h')
0 files changed, 0 insertions, 0 deletions