projects / kernel / swap-modules.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d30225 576d63a)
Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 15 May 2013 14:25:55 +0000 (18:25 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 15 May 2013 14:25:55 +0000 (18:25 +0400)
commit38eb6b83229d4b5624833de3ab3c577111885220
treef892638c22aa9ed1c5509f9734d7c28b3cd23afctree | snapshot
parent3d30225bb68f60d0f6d9374f60dc49afb80527a0commit | diff
parent576d63a0f724a26eb85d7cff9256a8726181869bcommit | diff
Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/Kbuild
src/modules/driver/filters/filter_by_pach.h
src/modules/driver/java_inst.c
src/modules/driver/sspt/sspt.h
src/modules/driver/sspt/sspt_proc.c
src/modules/driver/sspt/sspt_proc.h
src/modules/driver/us_proc_inst.c
13 files changed:
driver/Kbuild diff1 | diff2 | blob | history
driver/device_driver.c diff1 | diff2 | blob | history
driver/helper.c diff1 | | blob | history
driver/sspt/sspt.h diff1 | diff2 | blob | history
driver/sspt/sspt_debug.h diff1 | diff2 | blob | history
driver/sspt/sspt_file.c diff1 | diff2 | blob | history
driver/sspt/sspt_file.h diff1 | diff2 | blob | history
driver/sspt/sspt_page.c diff1 | diff2 | blob | history
driver/sspt/sspt_proc.c diff1 | diff2 | blob | history
driver/sspt/sspt_proc.h diff1 | diff2 | blob | history
driver/storage.h diff1 | diff2 | blob | history
driver/us_proc_inst.c diff1 | diff2 | blob | history
driver/us_proc_inst.h diff1 | diff2 | blob | history
Domain: System / System Tools;