"944483d0330bb497549977aa9649be6b7d0ede37" (history) in projects: openbmc

Searched hist:"944483 d0330bb497549977aa9649be6b7d0ede37" (Results 1 – 5 of 5) sorted by relevance

/openbmc/linux/arch/arm/mach-omap1/
H A D	ocpi.c	`diff 944483d0330bb497549977aa9649be6b7d0ede37 Sat Jul 26 10:54:21 CDT 2014 Arnd Bergmann <arnd@arndb.de> Merge branch 'next/fixes-non-critical' into next/soc This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>`
/openbmc/linux/arch/arm/mach-omap2/
H A D	usb-tusb6010.c	`diff 944483d0330bb497549977aa9649be6b7d0ede37 Sat Jul 26 10:54:21 CDT 2014 Arnd Bergmann <arnd@arndb.de> Merge branch 'next/fixes-non-critical' into next/soc This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>`
/openbmc/linux/arch/arm/mach-exynos/
H A D	pm.c	`diff 944483d0330bb497549977aa9649be6b7d0ede37 Sat Jul 26 10:54:21 CDT 2014 Arnd Bergmann <arnd@arndb.de> Merge branch 'next/fixes-non-critical' into next/soc This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>`
H A D	platsmp.c	`diff 944483d0330bb497549977aa9649be6b7d0ede37 Sat Jul 26 10:54:21 CDT 2014 Arnd Bergmann <arnd@arndb.de> Merge branch 'next/fixes-non-critical' into next/soc This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>`
/openbmc/linux/
H A D	MAINTAINERS	`diff 944483d0330bb497549977aa9649be6b7d0ede37 Sat Jul 26 10:54:21 CDT 2014 Arnd Bergmann <arnd@arndb.de> Merge branch 'next/fixes-non-critical' into next/soc This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>`

Project(s)

Full Search
Definition
Symbol
File Path
History
Type