Greg Kroah-Hartman e9563355ac 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>

2010-08-05 14:18:03 -07:00

..

Kconfig

staging: memrar depends on RAR_REGISTER

2010-05-11 15:56:19 -07:00

Makefile

staging: Intel Restricted Access Region Handler

2010-05-11 11:35:33 -07:00

memrar_allocator.c

staging: Intel Restricted Access Region Handler

2010-05-11 11:35:33 -07:00

memrar_allocator.h

staging: Intel Restricted Access Region Handler

2010-05-11 11:35:33 -07:00

memrar_handler.c

Staging: Merge staging-next into Linus's tree

2010-08-05 14:18:03 -07:00

memrar-abi

memrar: Updated maintainer contact information

2010-07-22 14:30:32 -07:00

memrar.h

staging: Intel Restricted Access Region Handler

2010-05-11 11:35:33 -07:00

TODO

memrar: Updated maintainer contact information

2010-07-22 14:30:32 -07:00