summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ramster
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.5-rc4 into staging-nextGreg Kroah-Hartman2012-06-251-4/+4
|\
| * Merge tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-06-041-4/+4
| |\
| | * frontswap: s/put_page/store/g s/get_page/loadKonrad Rzeszutek Wilk2012-05-151-4/+4
* | | Staging: ramster: r2net: fix coding style issuesAdnan Ali2012-06-121-2/+2
|/ /
* | Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-224-7/+7
|\ \
| * | Revert "ramster: switch over to zsmalloc and crypto interface"Greg Kroah-Hartman2012-05-167-199/+735
| * | ramster: switch over to zsmalloc and crypto interfaceDan Magenheimer2012-05-147-735/+199
| * | staging: ramster: depend on NET for sock_* functionsSasha Levin2012-05-081-1/+1
| * | staging: ramster: Fix typo in zcache-main.cMasanari Iida2012-05-081-2/+2
| * | Merge 3.4-rc5 into staging-nextGreg Kroah-Hartman2012-05-023-4/+4
| |\ \
| | * | staging:ramster Fix typos in staging:ramsterJustin P. Mattock2012-04-103-4/+4
| | |/
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-231-5/+1
|\ \ \ | |/ /
| * | staging: ramster: unbreak my heartDan Magenheimer2012-04-101-5/+1
| |/
* | sock: Introduce named constants for sk_reusePavel Emelyanov2012-04-211-1/+1
|/
* Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-212-30/+29
* staging: ramster: Dont build ramster when CONFIGFS_FS=mDan Magenheimer2012-02-241-1/+5
* staging: ramster: build ramster properly when CONFIG_OCFS2=m|yDan Magenheimer2012-02-242-19/+19
* Staging: ramster: mark BROKENGreg Kroah-Hartman2012-02-161-1/+1
* staging: ramster: ramster-specific new filesDan Magenheimer2012-02-154-0/+554
* staging: ramster: ramster-specific changes to zcache/tmemDan Magenheimer2012-02-155-289/+1738
* staging: ramster: xvmalloc allocation filesDan Magenheimer2012-02-153-0/+635
* staging: ramster: local compression + tmemDan Magenheimer2012-02-155-0/+2980
* staging: ramster: cluster/messaging foundationDan Magenheimer2012-02-1511-0/+4711
OpenPOWER on IntegriCloud