kernel/swap-modules.git
11 years ago... %) ... fix 875e37afe61583c4a0901ec8482ec4aef1694328
Vyacheslav Cherkashin [Thu, 29 Nov 2012 06:04:48 +0000 (10:04 +0400)]
... %) ... fix 875e37afe61583c4a0901ec8482ec4aef1694328

11 years agofixed function '__switch_to' on x86
Vyacheslav Cherkashin [Thu, 29 Nov 2012 05:54:04 +0000 (09:54 +0400)]
fixed function '__switch_to' on x86

11 years agodisabled debug in insmod and patchko if using on target
Vitaliy Cherepanov [Tue, 27 Nov 2012 14:38:49 +0000 (18:38 +0400)]
disabled debug in insmod and patchko if using on target

modified:   src/modules/driver/insmod.sh
modified:   src/modules/driver/patchko.sh

11 years agopatchko.sh and insmod.sh moved to modules driver
Vitaliy Cherepanov [Tue, 27 Nov 2012 13:55:18 +0000 (17:55 +0400)]
patchko.sh and insmod.sh moved to modules driver
try to fix sa tests

11 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vitaliy Cherepanov [Mon, 26 Nov 2012 14:42:49 +0000 (18:42 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

11 years ago auto patching modules system added (test version)
Vitaliy Cherepanov [Mon, 26 Nov 2012 14:42:16 +0000 (18:42 +0400)]
auto patching modules system added (test version)
    do not use insmod command, use insmod.sh instead of insmod

    it's patch kernel version in module which for it is compiled
    to kernel version it is started on
    (user friendly level up)

11 years agoNew sampling meta architecture introduced!
Andreev S.V [Mon, 26 Nov 2012 11:00:16 +0000 (15:00 +0400)]
New sampling meta architecture introduced!

11 years agoTicket #470 fix (otg probes from dlsymmed handler now removed correctly (I hope))
Alexander Aksenov [Thu, 22 Nov 2012 16:48:59 +0000 (20:48 +0400)]
Ticket #470 fix (otg probes from dlsymmed handler now removed correctly (I hope))

11 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Alexander Aksenov [Tue, 20 Nov 2012 11:01:13 +0000 (15:01 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

11 years agoNow dlsymmed_handler correctly removes otg probes
Alexander Aksenov [Tue, 20 Nov 2012 11:00:55 +0000 (15:00 +0400)]
Now dlsymmed_handler correctly removes otg probes

11 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vitaliy Cherepanov [Tue, 20 Nov 2012 09:39:31 +0000 (13:39 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/daemon/Makefile.am

11 years agoSmall refactoring
Alexander Aksenov [Fri, 16 Nov 2012 15:39:30 +0000 (19:39 +0400)]
Small refactoring

11 years agoFixed bundle parsing (app probes dropping in libonly)
Alexander Aksenov [Wed, 14 Nov 2012 13:47:12 +0000 (17:47 +0400)]
Fixed bundle parsing (app probes dropping in libonly)

11 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Wed, 14 Nov 2012 07:17:19 +0000 (11:17 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

11 years agofixed us probes in thumb2 mode
Vyacheslav Cherkashin [Wed, 14 Nov 2012 07:16:19 +0000 (11:16 +0400)]
fixed us probes in thumb2 mode

a one-time activation

11 years agoNow null pointer returned by find_vma() correctly handled
Alexander Aksenov [Tue, 13 Nov 2012 12:22:08 +0000 (16:22 +0400)]
Now null pointer returned by find_vma() correctly handled

11 years agoRemoved debug printk
Alexander Aksenov [Mon, 12 Nov 2012 15:21:25 +0000 (19:21 +0400)]
Removed debug printk

11 years agoNow plt functions instrumentation differs app from lib by vma flag
Alexander Aksenov [Mon, 12 Nov 2012 14:41:59 +0000 (18:41 +0400)]
Now plt functions instrumentation differs app from lib by vma flag

12 years agoSmall plt refactoring
Alexander Aksenov [Fri, 9 Nov 2012 18:26:58 +0000 (22:26 +0400)]
Small plt refactoring

12 years agofix commit a089b91c61b823766e1cf65bcc73b6b7538e04b1
Vyacheslav Cherkashin [Wed, 7 Nov 2012 13:18:15 +0000 (17:18 +0400)]
fix commit a089b91c61b823766e1cf65bcc73b6b7538e04b1

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Wed, 7 Nov 2012 12:32:35 +0000 (16:32 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoadded monitoring function 'do_mnumap'
Vyacheslav Cherkashin [Wed, 7 Nov 2012 12:31:01 +0000 (16:31 +0400)]
added monitoring function 'do_mnumap'

12 years agoOptimized plt instrumentation
Alexander Aksenov [Tue, 6 Nov 2012 17:33:29 +0000 (21:33 +0400)]
Optimized plt instrumentation

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Alexander Aksenov [Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoNow offset sended from target
Alexander Aksenov [Tue, 6 Nov 2012 15:54:57 +0000 (19:54 +0400)]
Now offset sended from target

12 years agoAdded an output both of variable name and variable in fbi mode.
Imran Navruzbekov [Tue, 6 Nov 2012 11:26:18 +0000 (15:26 +0400)]
Added an output both of variable name and variable in fbi mode.

12 years agoFixed deleted string in storage and application GOT addresses
Alexander Aksenov [Tue, 6 Nov 2012 11:18:15 +0000 (15:18 +0400)]
Fixed deleted string in storage and application GOT addresses

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Tue, 6 Nov 2012 09:43:02 +0000 (13:43 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agofixed function 'arch_check_insn_thumb'
Vyacheslav Cherkashin [Tue, 6 Nov 2012 09:37:20 +0000 (13:37 +0400)]
fixed function 'arch_check_insn_thumb'

added ignoring CBZ/CBNZ instruction

12 years agoNow plt works with app lib and lib only instrumentation
Alexander Aksenov [Fri, 2 Nov 2012 16:19:34 +0000 (20:19 +0400)]
Now plt works with app lib and lib only instrumentation

12 years agoMerge branch 'dev' into plt_branch
Alexander Aksenov [Fri, 2 Nov 2012 14:59:12 +0000 (18:59 +0400)]
Merge branch 'dev' into plt_branch

12 years agoplt functions handling
Alexander Aksenov [Fri, 2 Nov 2012 14:58:04 +0000 (18:58 +0400)]
plt functions handling

12 years agoMEC: fixed most warning; made initial code redesign
Vasiliy Ulyanov [Fri, 2 Nov 2012 09:14:39 +0000 (13:14 +0400)]
MEC: fixed most warning; made initial code redesign

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vitaliy Cherepanov [Thu, 25 Oct 2012 09:42:14 +0000 (13:42 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/probes/probes.def

12 years agoMerge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
Dmitry Kovalenko [Tue, 23 Oct 2012 12:04:43 +0000 (16:04 +0400)]
Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

12 years agoFully removed "symbol" from target (no-standalone) part
Dmitry Kovalenko [Tue, 23 Oct 2012 12:04:36 +0000 (16:04 +0400)]
Fully removed "symbol" from target (no-standalone) part

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Thu, 18 Oct 2012 08:29:12 +0000 (12:29 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/us_proc_inst.c

12 years agofixed and remove warning
Vyacheslav Cherkashin [Thu, 18 Oct 2012 08:22:00 +0000 (12:22 +0400)]
fixed and remove warning

but warning in file 'src/probes/probes.def' lines 950 and 980

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Kudrjavtsev Nickita [Wed, 17 Oct 2012 15:43:11 +0000 (19:43 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agosolving the problem of addres instead function name
Kudrjavtsev Nickita [Wed, 17 Oct 2012 15:41:02 +0000 (19:41 +0400)]
solving the problem of addres instead function name

12 years agoFixed hardcoded device name in swap_driver.sh
Nikita Kalyazin [Wed, 17 Oct 2012 12:29:23 +0000 (16:29 +0400)]
Fixed hardcoded device name in swap_driver.sh

12 years agofixed vma filter
Vyacheslav Cherkashin [Tue, 16 Oct 2012 13:50:21 +0000 (17:50 +0400)]
fixed vma filter

12 years agocorrect processing prelink libraries
Vyacheslav Cherkashin [Mon, 15 Oct 2012 08:08:37 +0000 (12:08 +0400)]
correct processing prelink libraries

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Mon, 15 Oct 2012 06:55:59 +0000 (10:55 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agorefactoring function 'inst_usr_space_proc'
Vyacheslav Cherkashin [Wed, 10 Oct 2012 08:28:43 +0000 (12:28 +0400)]
refactoring function 'inst_usr_space_proc'

add function 'get_dentry'

12 years agoMerge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
Dmitry Kovalenko [Mon, 1 Oct 2012 10:10:55 +0000 (14:10 +0400)]
Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

12 years agofix bug rp2, when installed kprobe kfree
Vyacheslav Cherkashin [Fri, 28 Sep 2012 11:24:53 +0000 (15:24 +0400)]
fix bug rp2, when installed kprobe kfree

12 years agodel user mode in kprobe_running (for ARM)
Vyacheslav Cherkashin [Fri, 28 Sep 2012 11:04:14 +0000 (15:04 +0400)]
del user mode in kprobe_running (for ARM)

12 years agorefactoring_kprobe
Vyacheslav Cherkashin [Fri, 28 Sep 2012 09:40:17 +0000 (13:40 +0400)]
refactoring_kprobe

12 years agoadd user mode in kprobe_running (for ARM)
Vyacheslav Cherkashin [Mon, 24 Sep 2012 08:19:39 +0000 (12:19 +0400)]
add user mode in kprobe_running (for ARM)

12 years agoMakefiles fix
Dmitry Kovalenko [Mon, 24 Sep 2012 06:27:08 +0000 (10:27 +0400)]
Makefiles fix

12 years agoDESTDIR expanded by prefix var in daemon's Makefile.am
Dmitry Kovalenko [Wed, 19 Sep 2012 14:42:57 +0000 (18:42 +0400)]
DESTDIR expanded by prefix var in daemon's Makefile.am

12 years agoBuildsystem redesign
Dmitry Kovalenko [Wed, 19 Sep 2012 09:26:58 +0000 (13:26 +0400)]
Buildsystem redesign

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Wed, 12 Sep 2012 08:19:24 +0000 (12:19 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoTicket #430
Vyacheslav Cherkashin [Wed, 12 Sep 2012 08:18:17 +0000 (12:18 +0400)]
Ticket #430

12 years agoFixed fail modules inserting handling
Nikita Kalyazin [Wed, 12 Sep 2012 08:04:10 +0000 (12:04 +0400)]
Fixed fail modules inserting handling

12 years agofix export function copy_to_user_page
Vyacheslav Cherkashin [Tue, 11 Sep 2012 13:41:51 +0000 (17:41 +0400)]
fix export function copy_to_user_page

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Tue, 11 Sep 2012 12:30:15 +0000 (16:30 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoTicket #426
Vyacheslav Cherkashin [Tue, 11 Sep 2012 12:26:02 +0000 (16:26 +0400)]
Ticket #426

created new allocator for slots

12 years agofix commit fd8ebf18bd07ee6380b260260e5dd9df38f41859
Vasiliy Ulyanov [Mon, 10 Sep 2012 05:11:51 +0000 (09:11 +0400)]
fix commit fd8ebf18bd07ee6380b260260e5dd9df38f41859

12 years agoadd function copy_to_user_page
Vyacheslav Cherkashin [Fri, 7 Sep 2012 07:49:18 +0000 (11:49 +0400)]
add function copy_to_user_page

fix commit ebdc6de11d57f4a9f946976d3c2ab88048377718

12 years agoadd support kernel 3.4
Vyacheslav Cherkashin [Thu, 6 Sep 2012 14:02:57 +0000 (18:02 +0400)]
add support kernel 3.4

refactoring support for kernel > 2.6.38

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Yury Morozov [Wed, 5 Sep 2012 14:03:41 +0000 (18:03 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoAdded functions, beginning with MOVW instruction, instrumentation
zorro [Thu, 30 Aug 2012 14:54:00 +0000 (18:54 +0400)]
Added functions, beginning with MOVW instruction, instrumentation

12 years agoAdded functions, beginning with MOVW, instrumentation
zorro [Thu, 30 Aug 2012 14:50:41 +0000 (18:50 +0400)]
Added functions, beginning with MOVW, instrumentation

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Wed, 29 Aug 2012 12:39:34 +0000 (16:39 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agofix miss events (recursion handling disabled)
Vyacheslav Cherkashin [Wed, 29 Aug 2012 10:37:30 +0000 (14:37 +0400)]
fix miss events (recursion handling disabled)
recursing?!

12 years agofix function 'mm_release_probe_pre_code'
Vyacheslav Cherkashin [Tue, 28 Aug 2012 10:15:47 +0000 (14:15 +0400)]
fix function 'mm_release_probe_pre_code'

12 years agofix function 'get_insn_slot'
Vyacheslav Cherkashin [Tue, 28 Aug 2012 05:11:42 +0000 (09:11 +0400)]
fix function 'get_insn_slot'

12 years agoremove uprobes, when the task is removed (called jprobe on function 'mm_release')
Vyacheslav Cherkashin [Wed, 22 Aug 2012 08:52:54 +0000 (12:52 +0400)]
remove uprobes, when the task is removed (called jprobe on function 'mm_release')

12 years agofix function void recover_child
Vyacheslav Cherkashin [Tue, 21 Aug 2012 12:32:07 +0000 (16:32 +0400)]
fix function void recover_child

12 years agoAdded feature of instrumentation of dynamic loaded libraries functions (plugins).
Andreev S.V [Tue, 28 Aug 2012 16:57:41 +0000 (20:57 +0400)]
Added feature of instrumentation of dynamic loaded libraries functions (plugins).

Description (usage):
1. swap.ini file must contain pathes where dynamic loaded libraries (plugins) located
   (for multiple pathes it must be separated by : (colon) sign)
   This is needed for proper library parsing.

2. For each unique dynamic loaded library (plugin) swap.ini file must contain
   full path to library and library name, like (e.g) this:

setv lib_dl_name "/usr/lib/libslp_devman_plugin.so" "libslp_devman_plugin.so"

   This is needed for proper instrumentation work.

3. To set probe on function of dynamic loaded library (plugin) use usual syntax, e.g.:

setp lib x "OEM_sys_get_devman_plugin_interface" "libslp_devman_plugin.so"

NOTE: in code left ability (via setp lib_dl token) to define separate path for each probe -
   this may be very useful when we have the same function and library names. This is
   for future development.

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Thu, 16 Aug 2012 14:56:17 +0000 (18:56 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoTickets: 151, 198, 200, 347. implemented unpatching tasks
Vyacheslav Cherkashin [Thu, 16 Aug 2012 14:56:05 +0000 (18:56 +0400)]
Tickets: 151, 198, 200, 347. implemented unpatching tasks

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vitaliy Cherepanov [Thu, 16 Aug 2012 07:55:37 +0000 (11:55 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/us_proc_inst.c

12 years agomerge
Vitaliy Cherepanov [Thu, 16 Aug 2012 07:49:22 +0000 (11:49 +0400)]
merge

12 years agouprobs: fixed check flags CLONE_VM in function copy_process_ret_pre_code(for 'fork')
Vyacheslav Cherkashin [Wed, 15 Aug 2012 10:42:55 +0000 (14:42 +0400)]
uprobs: fixed check flags CLONE_VM in function copy_process_ret_pre_code(for 'fork')

12 years agofix: error build function IS_ERR_OR_NULL no tegra_selp
Vyacheslav Cherkashin [Mon, 13 Aug 2012 07:52:00 +0000 (11:52 +0400)]
fix: error build function IS_ERR_OR_NULL no tegra_selp

12 years agouprobs: fixed instrumentation 'fork'
Vyacheslav Cherkashin [Fri, 10 Aug 2012 12:54:38 +0000 (16:54 +0400)]
uprobs: fixed instrumentation 'fork'

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Vyacheslav Cherkashin [Wed, 8 Aug 2012 12:27:04 +0000 (16:27 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agomini refactoring kprobes
Vyacheslav Cherkashin [Wed, 8 Aug 2012 12:26:54 +0000 (16:26 +0400)]
mini refactoring kprobes

12 years agoInitial implementation of sampling approach (Ticket #393) - time-based approach imple...
Andreev S.V [Mon, 6 Aug 2012 13:23:03 +0000 (17:23 +0400)]
Initial implementation of sampling approach (Ticket #393) - time-based approach implemented. In comments - dreams of event-based approach.

12 years agokprobes: implementation instruction B(ARM) in uprobes
Vyacheslav Cherkashin [Tue, 31 Jul 2012 10:10:30 +0000 (14:10 +0400)]
kprobes: implementation instruction B(ARM) in uprobes

12 years agoMerge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
Dmitry Kovalenko [Mon, 30 Jul 2012 05:14:44 +0000 (09:14 +0400)]
Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

12 years agoFixed handling of unsupported instruction instrumentation (#363)
Dmitry Kovalenko [Mon, 30 Jul 2012 05:14:37 +0000 (09:14 +0400)]
Fixed handling of unsupported instruction instrumentation (#363)

12 years agoFixed 'EC_ARCH_*' defines for x86
Vasiliy Ulyanov [Fri, 27 Jul 2012 07:41:47 +0000 (11:41 +0400)]
Fixed 'EC_ARCH_*' defines for x86

12 years agoReturned magically disapeared line of code
Andreev S.V [Thu, 26 Jul 2012 12:59:12 +0000 (16:59 +0400)]
Returned magically disapeared line of code

12 years agoNew multiple handler API implementation introduced
Andreev S.V [Thu, 26 Jul 2012 11:47:43 +0000 (15:47 +0400)]
New multiple handler API implementation introduced

12 years agoMerge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Yury Morozov [Thu, 26 Jul 2012 08:35:09 +0000 (12:35 +0400)]
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

12 years agoDlsym(dynamically loaded libraries) function handling was added.
Yury Morozov [Thu, 26 Jul 2012 08:31:20 +0000 (12:31 +0400)]
Dlsym(dynamically loaded libraries) function handling was added.
insmod dlsymmed_handlers.ko to make all dyn lib funcs to be inserted to trace.

12 years ago#define regs_return_value: check ARCH
Vyacheslav Cherkashin [Mon, 23 Jul 2012 13:36:38 +0000 (17:36 +0400)]
#define regs_return_value: check ARCH

12 years agodo_page_fault instrumentation workaround for x86 platform
Vasiliy Ulyanov [Mon, 16 Jul 2012 06:05:22 +0000 (10:05 +0400)]
do_page_fault instrumentation workaround for x86 platform

12 years agoAdded major number release
Fedin Pavel [Thu, 12 Jul 2012 15:34:41 +0000 (19:34 +0400)]
Added major number release

12 years agoMEC: fixed ret_addr obtaining (needs testing!!!)
Vasiliy Ulyanov [Thu, 12 Jul 2012 05:54:43 +0000 (09:54 +0400)]
MEC: fixed ret_addr obtaining (needs testing!!!)

12 years agoMerge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
Dmitry Kovalenko [Tue, 10 Jul 2012 06:58:55 +0000 (10:58 +0400)]
Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

12 years agoFixed struct kprobe (arm/thumb_safe now under CONFIG_ARM define)
Dmitry Kovalenko [Tue, 10 Jul 2012 06:58:51 +0000 (10:58 +0400)]
Fixed struct kprobe (arm/thumb_safe now under CONFIG_ARM define)

12 years agoFixed ARM/THUMB instructions safe checking (#372)
Dmitry Kovalenko [Tue, 10 Jul 2012 06:51:20 +0000 (10:51 +0400)]
Fixed ARM/THUMB instructions safe checking (#372)

12 years ago1. POCOMON ported to x86 tizen emulator
Vasiliy Ulyanov [Mon, 9 Jul 2012 08:47:31 +0000 (12:47 +0400)]
1. POCOMON ported to x86 tizen emulator
2. Made several minor fixes

12 years agoRevert "Fixed libonly instrumentation (#264)"
Nikita Kalyazin [Fri, 6 Jul 2012 12:46:07 +0000 (16:46 +0400)]
Revert "Fixed libonly instrumentation (#264)"

This reverts commit f8292b787f894df3b47fc7ee80b486f7dd5dac53.

The trace is not collected from Browser application (App&Lib inst) if
the application is launched after start tracing.

12 years agoMerge branch 'x86-testing' into dev
Vasiliy Ulyanov [Fri, 6 Jul 2012 11:15:39 +0000 (15:15 +0400)]
Merge branch 'x86-testing' into dev