summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'fixes' and 'fixes2' into devel-lateOlof Johansson2012-05-315-122/+52
|\ \
| | * ARM: LPC32xx: Adjust dts files to gpio dt bindingRoland Stigge2012-05-312-41/+4
| * | ixp4xx: fix compilation by adding gpiolib supportRichard Cochran2012-05-233-81/+48
* | | Merge branch 'late/board' into devel-lateOlof Johansson2012-05-312-1/+9
|\ \ \
| * \ \ Merge branch 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-05-202-1/+9
| |\ \ \
| | * | | ARM: S3C64XX: Hook up carrier class modules on CragganmoreMark Brown2012-05-161-0/+1
| | * | | ARM: S3C64XX: Initial hookup for Bells module on CragganmoreMark Brown2012-05-161-1/+8
| |/ / /
* | | | Merge branch 'late/soc' into devel-lateOlof Johansson2012-05-3119-185/+630
|\ \ \ \
| * \ \ \ Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux i...Olof Johansson2012-05-26127-557/+1028
| |\ \ \ \
| | * | | | ARM: vexpress: Remove twice included header filesThomas Weber2012-05-211-2/+0
| | * | | | ARM: vexpress: Device Tree updatesPawel Moll2012-05-213-7/+28
| | | |/ / | | |/| |
| * | | | Merge branch 'next/devel-samsung-2' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-05-2073-1345/+3083
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | ARM: EXYNOS: Support suspend and resume for EXYNOS5250Jongpill Lee2012-05-194-36/+110
| | * | | ARM: EXYNOS: Add Clock register list for save and restoreJongpill Lee2012-05-192-2/+67
| | * | | ARM: EXYNOS: Add PMU table for EXYNOS5250Jongpill Lee2012-05-196-27/+265
| | * | | ARM: EXYNOS: Rename of function for pm.cJongpill Lee2012-05-191-27/+28
| | * | | ARM: EXYNOS: Remove GIC save & restore functionJongpill Lee2012-05-191-83/+0
| | * | | ARM: dts: Add node for interrupt combiner controller on EXYNOS5250Thomas Abraham2012-05-191-0/+16
| | * | | ARM: S3C24XX: add support for second irq set of S3C2416Heiko Stuebner2012-05-194-1/+116
| | * | | Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2Kukjin Kim2012-05-1932-368/+567
| | |\ \ \
| | * | | | Merge branch 'next/devel-samsung' into next/devel-samsung-2Kukjin Kim2012-05-1942-805/+1918
| |/| | | |
* | | | | | Merge branch 'late/cleanup' into devel-lateOlof Johansson2012-05-311-30/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson2012-05-201-30/+15
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ARM: S3C64XX: use timekeeping wrapper on cpuidleDaniel Lezcano2012-05-181-11/+1
| | * | | | ARM: S3C64XX: declare the states with the new api on cpuidleDaniel Lezcano2012-05-181-19/+14
| |/ / / /
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-clientLinus Torvalds2012-05-3023-453/+376
|\ \ \ \ \
| * | | | | libceph: fix pg_temp updatesSage Weil2012-05-221-1/+5
| * | | | | libceph: avoid unregistering osd request when not registeredSage Weil2012-05-191-0/+6
| * | | | | ceph: add auth buf in prepare_write_connect()Alex Elder2012-05-191-9/+9
| * | | | | ceph: rename prepare_connect_authorizer()Alex Elder2012-05-171-6/+7
| * | | | | ceph: return pointer from prepare_connect_authorizer()Alex Elder2012-05-171-9/+9
| * | | | | ceph: use info returned by get_authorizerAlex Elder2012-05-174-25/+10
| * | | | | ceph: have get_authorizer methods return pointersAlex Elder2012-05-174-21/+34
| * | | | | ceph: ensure auth ops are defined before useAlex Elder2012-05-172-13/+16
| * | | | | ceph: messenger: reduce args to create_authorizerAlex Elder2012-05-175-50/+39
| * | | | | ceph: define ceph_auth_handshake typeAlex Elder2012-05-175-41/+47
| * | | | | ceph: messenger: check return from get_authorizerAlex Elder2012-05-171-3/+7
| * | | | | ceph: messenger: rework prepare_connect_authorizer()Alex Elder2012-05-171-9/+19
| * | | | | ceph: messenger: check prepare_write_connect() resultAlex Elder2012-05-171-4/+12
| * | | | | ceph: don't set WRITE_PENDING too earlyAlex Elder2012-05-171-1/+5
| * | | | | ceph: drop msgr argument from prepare_write_connect()Alex Elder2012-05-171-14/+11
| * | | | | ceph: messenger: send banner in process_connect()Alex Elder2012-05-171-9/+7
| * | | | | ceph: messenger: reset connection kvec callerAlex Elder2012-05-171-1/+5
| * | | | | libceph: don't reset kvec in prepare_write_banner()Alex Elder2012-05-171-3/+1
| * | | | | ceph: ignore preferred_osd fieldSage Weil2012-05-161-4/+0
| * | | | | ceph: fully initialize new layoutSage Weil2012-05-162-6/+15
| * | | | | ceph: messenger: change read_partial() to take "end" argAlex Elder2012-05-141-22/+38
| * | | | | ceph: messenger: update "to" in read_partial() callerAlex Elder2012-05-141-15/+16
| * | | | | ceph: messenger: use read_partial() in read_partial_message()Alex Elder2012-05-141-20/+10
| * | | | | rbd: correct sysfs snap attribute documentationJosh Durgin2012-05-141-2/+2