Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 189f0e7 ce8838c)

author	Grazvydas Ignotas <notasas@gmail.com>
	Fri, 7 May 2010 13:52:18 +0000 (16:52 +0300)
committer	Grazvydas Ignotas <notasas@gmail.com>
	Fri, 7 May 2010 13:52:18 +0000 (16:52 +0300)
commit	3a6c2f8305acbad93fb5c527abb1872f365caddf
tree	3b66bec4a414d66a29abc8fb0b818f806bf36542	tree \| snapshot
parent	189f0e76832b4a2d3bcc0d973ed4240170e04c29	commit \| diff
parent	ce8838c66d56085122fb275c1f7d3821245fca54	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/stable/linux-2.6.27.y into pandora-27-omap1_rework

Conflicts:
drivers/usb/musb/davinci.c
security/Kconfig

Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/davinci.c	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository